ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-31 13:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jgallagher/master' into vtab

Browse Source
This commit is contained in:
gwenn
2016-05-20 18:31:30 +02:00
parent ef6fcc8976 1950158c87
commit 0740620ffe
16 changed files with 71 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vtab/csvtab.rs
View File

@@ -228,7 +228,7 @@ impl From<csv::Error> for Error {
#[cfg(test)]
mod test {
use Connection;
use {Connection,Result};
use vtab::csvtab;
#[test]
@@ -244,13 +244,8 @@ mod test {
assert_eq!(vec!["rowid", "colA", "colB", "colC"], headers);
}
let rows = s.query(&[]).unwrap();
let mut sum = 0;
for row in rows {
let row = row.unwrap();
let id: i64 = row.get(0);
sum = sum + id;
}
let ids: Result<Vec<i32>> = s.query_map(&[], |row| row.get::<i32, i32>(0)).unwrap().collect();
let sum = ids.unwrap().iter().fold(0, |acc, &id| acc + id);
assert_eq!(sum, 15);
}
db.execute_batch("DROP TABLE vtab").unwrap();

6
src/vtab/int_array.rs
View File

@@ -163,14 +163,12 @@ mod test {
p3.borrow_mut().append(&mut vec![-1, -5, -10]);
{
let rows = s.query(&[]).unwrap();
for row in rows {
let row = row.unwrap();
s.query_map(&[], |row| {
let i1: i64 = row.get(0);
assert!(i1 == 1 || i1 == 3);
assert_eq!(11, row.get(1));
assert_eq!(-5, row.get(2));
}
}).unwrap();
}
p1.borrow_mut().clear();