Introduce NO_PARAMS constant

As suggested here:
https://users.rust-lang.org/t/sql-parameter-values/20469/2
This commit is contained in:
gwenn
2018-09-16 11:10:19 +02:00
parent c4ae541eac
commit e7e03c3443
15 changed files with 152 additions and 208 deletions

View File

@@ -341,8 +341,7 @@ impl From<csv::Error> for Error {
#[cfg(test)]
mod test {
use vtab::csvtab;
use {Connection, Result};
use types::ToSql;
use {Connection, Result, NO_PARAMS};
#[test]
fn test_csv_module() {
@@ -359,7 +358,7 @@ mod test {
}
let ids: Result<Vec<i32>> = s
.query_map(&[] as &[&ToSql], |row| row.get::<_, i32>(0))
.query_map(NO_PARAMS, |row| row.get::<_, i32>(0))
.unwrap()
.collect();
let sum = ids.unwrap().iter().fold(0, |acc, &id| acc + id);
@@ -382,7 +381,7 @@ mod test {
v1.rowid < v2.rowid",
).unwrap();
let mut rows = s.query(&[] as &[&ToSql]).unwrap();
let mut rows = s.query(NO_PARAMS).unwrap();
let row = rows.next().unwrap().unwrap();
assert_eq!(row.get::<_, i32>(0), 2);
}

View File

@@ -265,8 +265,7 @@ impl VTabCursor for SeriesTabCursor {
mod test {
use ffi;
use vtab::series;
use Connection;
use types::ToSql;
use {Connection, NO_PARAMS};
#[test]
fn test_series_module() {
@@ -280,7 +279,7 @@ mod test {
let mut s = db.prepare("SELECT * FROM generate_series(0,20,5)").unwrap();
let series = s.query_map(&[] as &[&ToSql], |row| row.get::<_, i32>(0)).unwrap();
let series = s.query_map(NO_PARAMS, |row| row.get::<_, i32>(0)).unwrap();
let mut expected = 0;
for value in series {