ISAR/rusqlite
2
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-12-21 19:02:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate NO_PARAMS in favor of passing an empty array

Browse Source
This commit is contained in:
Thom Chiovoloni
2020-11-03 01:32:46 -08:00
parent 2461ebf62f
commit 22121772a2
23 changed files with 126 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/cache.rs
View File

@@ -164,7 +164,7 @@ impl StatementCache {
#[cfg(test)]
mod test {
use super::StatementCache;
use crate::{Connection, NO_PARAMS};
use crate::Connection;
use fallible_iterator::FallibleIterator;
impl StatementCache {
@@ -193,20 +193,14 @@ mod test {
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
}
assert_eq!(1, cache.len());
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
}
assert_eq!(1, cache.len());
@@ -224,10 +218,7 @@ mod test {
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
}
assert_eq!(1, cache.len());
@@ -237,10 +228,7 @@ mod test {
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
}
assert_eq!(0, cache.len());
@@ -248,10 +236,7 @@ mod test {
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
}
assert_eq!(1, cache.len());
}
@@ -265,10 +250,7 @@ mod test {
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
stmt.discard();
}
assert_eq!(0, cache.len());
@@ -291,7 +273,7 @@ mod test {
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(
Ok(Some(1i32)),
stmt.query(NO_PARAMS).unwrap().map(|r| r.get(0)).next()
stmt.query([]).unwrap().map(|r| r.get(0)).next()
);
}
@@ -307,7 +289,7 @@ mod test {
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(
Ok(Some((1i32, 2i32))),
stmt.query(NO_PARAMS)
stmt.query([])
.unwrap()
.map(|r| Ok((r.get(0)?, r.get(1)?)))
.next()
@@ -334,20 +316,14 @@ mod test {
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
}
assert_eq!(1, cache.len());
{
let mut stmt = db.prepare_cached(sql).unwrap();
assert_eq!(0, cache.len());
assert_eq!(
0,
stmt.query_row(NO_PARAMS, |r| r.get::<_, i64>(0)).unwrap()
);
assert_eq!(0, stmt.query_row([], |r| r.get::<_, i64>(0)).unwrap());
}
assert_eq!(1, cache.len());
}