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

Fix regressions

Browse Source
This commit is contained in:
gwenn
2018-06-10 19:21:55 +02:00
parent d72c4582d9
commit b8594a0f83
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/statement.rs
View File

@@ -411,7 +411,7 @@ impl<'conn> Statement<'conn> {
#[cfg(feature = "array")] #[cfg(feature = "array")]
ToSqlOutput::Array(a) => { ToSqlOutput::Array(a) => {
return self.conn return self.conn
.decode_result(unsafe { ffi::sqlite3_bind_pointer(ptr, col, Rc::into_raw(a) as *mut c_void, ARRAY_TYPE, Some(free_array)) }); .decode_result(unsafe { ffi::sqlite3_bind_pointer(ptr, col as c_int, Rc::into_raw(a) as *mut c_void, ARRAY_TYPE, Some(free_array)) });
} }
}; };
self.conn self.conn

4
src/vtab/csvtab.rs
View File

@@ -364,7 +364,7 @@ mod test {
} }
let ids: Result<Vec<i32>> = s let ids: Result<Vec<i32>> = s
.query_map(&[], |row| row.get::<i32, i32>(0)) .query_map(&[], |row| row.get::<_, i32>(0))
.unwrap() .unwrap()
.collect(); .collect();
let sum = ids.unwrap().iter().fold(0, |acc, &id| acc + id); let sum = ids.unwrap().iter().fold(0, |acc, &id| acc + id);
@@ -389,7 +389,7 @@ mod test {
let mut rows = s.query(&[]).unwrap(); let mut rows = s.query(&[]).unwrap();
let row = rows.next().unwrap().unwrap(); let row = rows.next().unwrap().unwrap();
assert_eq!(row.get::<i32, i32>(0), 2); assert_eq!(row.get::<_, i32>(0), 2);
} }
db.execute_batch("DROP TABLE vtab").unwrap(); db.execute_batch("DROP TABLE vtab").unwrap();
} }

10
src/vtab/int_array.rs
View File

@@ -180,8 +180,8 @@ mod test {
s.query_map(&[], |row| { s.query_map(&[], |row| {
let i1: i64 = row.get(0); let i1: i64 = row.get(0);
assert!(i1 == 1 || i1 == 3); assert!(i1 == 1 || i1 == 3);
assert_eq!(11, row.get::<i32, i32>(1)); assert_eq!(11, row.get::<_, i32>(1));
assert_eq!(-5, row.get::<i32, i32>(2)); assert_eq!(-5, row.get::<_, i32>(2));
}).unwrap(); }).unwrap();
} }
@@ -195,9 +195,9 @@ mod test {
{ {
let mut rows = s.query(&[]).unwrap(); let mut rows = s.query(&[]).unwrap();
let row = rows.next().unwrap().unwrap(); let row = rows.next().unwrap().unwrap();
assert_eq!(1, row.get::<i32, i32>(0)); assert_eq!(1, row.get::<_, i32>(0));
assert_eq!(11, row.get::<i32, i32>(1)); assert_eq!(11, row.get::<_, i32>(1));
assert_eq!(-5, row.get::<i32, i32>(2)); assert_eq!(-5, row.get::<_, i32>(2));
} }
p2.borrow_mut().clear(); p2.borrow_mut().clear();

2
src/vtab/mod.rs
View File

@@ -235,7 +235,7 @@ impl<'a> Values<'a> {
FromSqlError::Other(err) => { FromSqlError::Other(err) => {
Error::FromSqlConversionFailure(idx, value.data_type(), err) Error::FromSqlConversionFailure(idx, value.data_type(), err)
} }
FromSqlError::OutOfRange(i) => Error::IntegralValueOutOfRange(idx as c_int, i), FromSqlError::OutOfRange(i) => Error::IntegralValueOutOfRange(idx, i),
}) })
} }

2
src/vtab/series.rs
View File

@@ -280,7 +280,7 @@ mod test {
let mut s = db.prepare("SELECT * FROM generate_series(0,20,5)").unwrap(); let mut s = db.prepare("SELECT * FROM generate_series(0,20,5)").unwrap();
let series = s.query_map(&[], |row| row.get::<i32, i32>(0)).unwrap(); let series = s.query_map(&[], |row| row.get::<_, i32>(0)).unwrap();
let mut expected = 0; let mut expected = 0;
for value in series { for value in series {