From b8594a0f839212ad0d9454705e337dccd9295a6c Mon Sep 17 00:00:00 2001
From: gwenn <gtreguier@gmail.com>
Date: Sun, 10 Jun 2018 19:21:55 +0200
Subject: [PATCH] Fix regressions

---
 src/statement.rs      |  2 +-
 src/vtab/csvtab.rs    |  4 ++--
 src/vtab/int_array.rs | 10 +++++-----
 src/vtab/mod.rs       |  2 +-
 src/vtab/series.rs    |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/statement.rs b/src/statement.rs
index dbe4cf1..b6dc13c 100644
--- a/src/statement.rs
+++ b/src/statement.rs
@@ -411,7 +411,7 @@ impl<'conn> Statement<'conn> {
             #[cfg(feature = "array")]
             ToSqlOutput::Array(a) => {
                 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
diff --git a/src/vtab/csvtab.rs b/src/vtab/csvtab.rs
index 2919995..f1aa5b7 100644
--- a/src/vtab/csvtab.rs
+++ b/src/vtab/csvtab.rs
@@ -364,7 +364,7 @@ mod test {
             }
 
             let ids: Result<Vec<i32>> = s
-                .query_map(&[], |row| row.get::<i32, i32>(0))
+                .query_map(&[], |row| row.get::<_, i32>(0))
                 .unwrap()
                 .collect();
             let sum = ids.unwrap().iter().fold(0, |acc, &id| acc + id);
@@ -389,7 +389,7 @@ mod test {
 
             let mut rows = s.query(&[]).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();
     }
diff --git a/src/vtab/int_array.rs b/src/vtab/int_array.rs
index d18b0f7..962aee7 100644
--- a/src/vtab/int_array.rs
+++ b/src/vtab/int_array.rs
@@ -180,8 +180,8 @@ mod test {
             s.query_map(&[], |row| {
                 let i1: i64 = row.get(0);
                 assert!(i1 == 1 || i1 == 3);
-                assert_eq!(11, row.get::<i32, i32>(1));
-                assert_eq!(-5, row.get::<i32, i32>(2));
+                assert_eq!(11, row.get::<_, i32>(1));
+                assert_eq!(-5, row.get::<_, i32>(2));
             }).unwrap();
         }
 
@@ -195,9 +195,9 @@ mod test {
         {
             let mut rows = s.query(&[]).unwrap();
             let row = rows.next().unwrap().unwrap();
-            assert_eq!(1, row.get::<i32, i32>(0));
-            assert_eq!(11, row.get::<i32, i32>(1));
-            assert_eq!(-5, row.get::<i32, i32>(2));
+            assert_eq!(1, row.get::<_, i32>(0));
+            assert_eq!(11, row.get::<_, i32>(1));
+            assert_eq!(-5, row.get::<_, i32>(2));
         }
 
         p2.borrow_mut().clear();
diff --git a/src/vtab/mod.rs b/src/vtab/mod.rs
index d988293..4c0b5fd 100644
--- a/src/vtab/mod.rs
+++ b/src/vtab/mod.rs
@@ -235,7 +235,7 @@ impl<'a> Values<'a> {
             FromSqlError::Other(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),
         })
     }
 
diff --git a/src/vtab/series.rs b/src/vtab/series.rs
index a469807..bcf6d16 100644
--- a/src/vtab/series.rs
+++ b/src/vtab/series.rs
@@ -280,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, i32>(0)).unwrap();
+        let series = s.query_map(&[], |row| row.get::<_, i32>(0)).unwrap();
 
         let mut expected = 0;
         for value in series {