Take IntoIterator rather than &[&ToSql] (#312)

This commit is contained in:
gwenn
2018-09-16 09:49:23 +02:00
parent bd1756adef
commit c4ae541eac
18 changed files with 341 additions and 235 deletions

View File

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

View File

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