mirrors/limbo
1
0
Fork 0
mirror of https://github.com/tursodatabase/limbo.git synced 2025-12-23 08:21:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add exec rows trait for more ergonomic testing in core_tester

Browse source
This commit is contained in:
pedrocarlo 2025-12-10 12:06:14 -03:00
parent c207eddd3f
commit ffbbd4c270
3 changed files with 51 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/lib.rs
View file

@ -110,7 +110,8 @@ pub use types::ValueRef;
use util::parse_schema_rows;
pub use util::IOExt;
pub use vdbe::{
builder::QueryMode, explain::EXPLAIN_COLUMNS, explain::EXPLAIN_QUERY_PLAN_COLUMNS, Register,
builder::QueryMode, explain::EXPLAIN_COLUMNS, explain::EXPLAIN_QUERY_PLAN_COLUMNS,
FromValueRow, Register,
};
/// Configuration for database features

2
tests/fuzz/mod.rs
View file

@ -278,7 +278,7 @@ mod fuzz_tests {
// Insert into limbo databases
let limbo_conns = dbs.iter().map(|db| db.connect_limbo()).collect::<Vec<_>>();
for (i, limbo_conn) in limbo_conns.iter().enumerate() {
for limbo_conn in limbo_conns.iter() {
limbo_exec_rows(limbo_conn, &insert);
}

49
tests/integration/common.rs
View file

@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
use std::sync::Arc;
use tempfile::TempDir;
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
use turso_core::{Connection, Database, Row, StepResult, IO};
use turso_core::{Connection, Database, FromValueRow, Row, StepResult, IO};
pub struct TempDatabase {
pub path: PathBuf,
@ -514,6 +514,53 @@ pub fn rusqlite_integrity_check(db_path: &Path) -> anyhow::Result<()> {
Ok(())
}
pub trait ExecRows<T> {
#[allow(dead_code)]
fn exec_rows(&self, query: &str) -> Vec<T>;
}
macro_rules! impl_exec_rows_for_tuple {
($($T:ident : $idx:tt),+) => {
impl<$($T),+> ExecRows<($($T,)+)> for Arc<Connection>
where
$($T: for<'a> FromValueRow<'a> + 'static,)+
{
fn exec_rows(&self, query: &str) -> Vec<($($T,)+)> {
let mut stmt = self.prepare(query).unwrap();
let mut rows = Vec::new();
'outer: loop {
let row = loop {
let result = stmt.step().unwrap();
match result {
turso_core::StepResult::Row => {
let row = stmt.row().unwrap();
break row;
}
turso_core::StepResult::IO => {
stmt.run_once().unwrap();
continue;
}
turso_core::StepResult::Done => break 'outer,
r => panic!("unexpected result {r:?}"),
}
};
rows.push(($(row.get($idx).unwrap(),)+));
}
rows
}
}
};
}
impl_exec_rows_for_tuple!(T0: 0);
impl_exec_rows_for_tuple!(T0: 0, T1: 1);
impl_exec_rows_for_tuple!(T0: 0, T1: 1, T2: 2);
impl_exec_rows_for_tuple!(T0: 0, T1: 1, T2: 2, T3: 3);
impl_exec_rows_for_tuple!(T0: 0, T1: 1, T2: 2, T3: 3, T4: 4);
impl_exec_rows_for_tuple!(T0: 0, T1: 1, T2: 2, T3: 3, T4: 4, T5: 5);
impl_exec_rows_for_tuple!(T0: 0, T1: 1, T2: 2, T3: 3, T4: 4, T5: 5, T6: 6);
impl_exec_rows_for_tuple!(T0: 0, T1: 1, T2: 2, T3: 3, T4: 4, T5: 5, T6: 6, T7: 7);
#[cfg(test)]
mod tests {
use std::{sync::Arc, vec};