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

Cargo.toml

@@ -23,7 +23,7 @@ csvtab = ["csv"]
 
 [dependencies]
 time = "~0.1.0"
-bitflags = "~0.1"
+bitflags = "0.7"
 libc = "~0.2"
 clippy = {version = "~0.0.58", optional = true}
 chrono = { version = "~0.2", optional = true }

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  TARGET: 1.6.0-x86_64-pc-windows-gnu
+  TARGET: 1.8.0-x86_64-pc-windows-gnu
   MSYS2_BITS: 64
 install:
   - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}.exe"

src/blob.rs

@@ -159,9 +159,8 @@ impl<'conn> io::Read for Blob<'conn> {
         if n <= 0 {
             return Ok(0);
         }
-        let rc = unsafe {
+        let rc =
-            ffi::sqlite3_blob_read(self.blob, mem::transmute(buf.as_ptr()), n, self.pos)
+            unsafe { ffi::sqlite3_blob_read(self.blob, mem::transmute(buf.as_ptr()), n, self.pos) };
-        };
         self.conn
             .decode_result(rc)
             .map(|_| {
@@ -353,7 +352,7 @@ mod test {
         {
             // ... but it should've written the first 10 bytes
             let mut blob = db.blob_open(DatabaseName::Main, "test", "content", rowid, false)
-                             .unwrap();
+                .unwrap();
             let mut bytes = [0u8; 10];
             assert_eq!(10, blob.read(&mut bytes[..]).unwrap());
             assert_eq!(b"0123456701", &bytes);
@@ -371,7 +370,7 @@ mod test {
         {
             // ... but it should've written the first 10 bytes
             let mut blob = db.blob_open(DatabaseName::Main, "test", "content", rowid, false)
-                             .unwrap();
+                .unwrap();
             let mut bytes = [0u8; 10];
             assert_eq!(10, blob.read(&mut bytes[..]).unwrap());
             assert_eq!(b"aaaaaaaaaa", &bytes);

src/convenient.rs

@@ -23,12 +23,14 @@ impl<'conn> Statement<'conn> {
     /// Return `true` if a query in the SQL statement it executes returns one or more rows
     /// and `false` if the SQL returns an empty set.
     pub fn exists(&mut self, params: &[&ToSql]) -> Result<bool> {
-        self.reset_if_needed();
         let mut rows = try!(self.query(params));
-        match rows.next() {
+        let exists = {
-            Some(_) => Ok(true),
+            match rows.next() {
-            None => Ok(false),
+                Some(_) => true,
-        }
+                None => false,
+            }
+        };
+        Ok(exists)
     }
 }
 

src/functions.rs

@@ -791,16 +791,16 @@ mod test {
     fn test_varargs_function() {
         let db = Connection::open_in_memory().unwrap();
         db.create_scalar_function("my_concat", -1, true, |ctx| {
-              let mut ret = String::new();
+                let mut ret = String::new();
 
-              for idx in 0..ctx.len() {
+                for idx in 0..ctx.len() {
-                  let s = try!(ctx.get::<String>(idx));
+                    let s = try!(ctx.get::<String>(idx));
-                  ret.push_str(&s);
+                    ret.push_str(&s);
-              }
+                }
 
-              Ok(ret)
+                Ok(ret)
-          })
+            })
-          .unwrap();
+            .unwrap();
 
         for &(expected, query) in &[("", "SELECT my_concat()"),
                                     ("onetwo", "SELECT my_concat('one', 'two')"),
@@ -851,18 +851,18 @@ mod test {
         // sum should return NULL when given no columns (contrast with count below)
         let no_result = "SELECT my_sum(i) FROM (SELECT 2 AS i WHERE 1 <> 1)";
         let result: Option<i64> = db.query_row(no_result, &[], |r| r.get(0))
-                                    .unwrap();
+            .unwrap();
         assert!(result.is_none());
 
         let single_sum = "SELECT my_sum(i) FROM (SELECT 2 AS i UNION ALL SELECT 2)";
         let result: i64 = db.query_row(single_sum, &[], |r| r.get(0))
-                            .unwrap();
+            .unwrap();
         assert_eq!(4, result);
 
         let dual_sum = "SELECT my_sum(i), my_sum(j) FROM (SELECT 2 AS i, 1 AS j UNION ALL SELECT \
                         2, 1)";
         let result: (i64, i64) = db.query_row(dual_sum, &[], |r| (r.get(0), r.get(1)))
-                                   .unwrap();
+            .unwrap();
         assert_eq!((4, 2), result);
     }
 
@@ -878,7 +878,7 @@ mod test {
 
         let single_sum = "SELECT my_count(i) FROM (SELECT 2 AS i UNION ALL SELECT 2)";
         let result: i64 = db.query_row(single_sum, &[], |r| r.get(0))
-                            .unwrap();
+            .unwrap();
         assert_eq!(2, result);
     }
 }

src/lib.rs

@@ -522,8 +522,8 @@ impl Connection {
 impl fmt::Debug for Connection {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_struct("Connection")
-         .field("path", &self.path)
+            .field("path", &self.path)
-         .finish()
+            .finish()
     }
 }
 
@@ -538,7 +538,7 @@ bitflags! {
     #[doc = "Flags for opening SQLite database connections."]
     #[doc = "See [sqlite3_open_v2](http://www.sqlite.org/c3ref/open.html) for details."]
     #[repr(C)]
-    flags OpenFlags: c_int {
+    pub flags OpenFlags: ::libc::c_int {
         const SQLITE_OPEN_READ_ONLY     = 0x00000001,
         const SQLITE_OPEN_READ_WRITE    = 0x00000002,
         const SQLITE_OPEN_CREATE        = 0x00000004,
@@ -709,7 +709,6 @@ pub type SqliteStatement<'conn> = Statement<'conn>;
 pub struct Statement<'conn> {
     conn: &'conn Connection,
     stmt: *mut ffi::sqlite3_stmt,
-    needs_reset: bool,
     column_count: c_int,
 }
 
@@ -718,7 +717,6 @@ impl<'conn> Statement<'conn> {
         Statement {
             conn: conn,
             stmt: stmt,
-            needs_reset: false,
             column_count: unsafe { ffi::sqlite3_column_count(stmt) },
         }
     }
@@ -827,13 +825,10 @@ impl<'conn> Statement<'conn> {
     ///
     /// Will return `Err` if binding parameters fails.
     pub fn query<'a>(&'a mut self, params: &[&ToSql]) -> Result<Rows<'a>> {
-        self.reset_if_needed();
-
         unsafe {
             try!(self.bind_parameters(params));
         }
 
-        self.needs_reset = true;
         Ok(Rows::new(self))
     }
 
@@ -907,15 +902,6 @@ impl<'conn> Statement<'conn> {
         Ok(())
     }
 
-    fn reset_if_needed(&mut self) {
-        if self.needs_reset {
-            unsafe {
-                ffi::sqlite3_reset(self.stmt);
-            };
-            self.needs_reset = false;
-        }
-    }
-
     fn finalize_(&mut self) -> Result<()> {
         let r = unsafe { ffi::sqlite3_finalize(self.stmt) };
         self.stmt = ptr::null_mut();
@@ -930,10 +916,10 @@ impl<'conn> fmt::Debug for Statement<'conn> {
             str::from_utf8(c_slice)
         };
         f.debug_struct("Statement")
-         .field("conn", self.conn)
+            .field("conn", self.conn)
-         .field("stmt", &self.stmt)
+            .field("stmt", &self.stmt)
-         .field("sql", &sql)
+            .field("sql", &sql)
-         .finish()
+            .finish()
     }
 }
 
@@ -976,7 +962,7 @@ impl<'stmt, T, E, F> Iterator for AndThenRows<'stmt, F>
     fn next(&mut self) -> Option<Self::Item> {
         self.rows.next().map(|row_result| {
             row_result.map_err(E::from)
-                      .and_then(|row| (self.map)(&row))
+                .and_then(|row| (self.map)(&row))
         })
     }
 }
@@ -1017,17 +1003,15 @@ pub type SqliteRows<'stmt> = Rows<'stmt>;
 /// `min`/`max` (which could return a stale row unless the last row happened to be the min or max,
 /// respectively).
 pub struct Rows<'stmt> {
-    stmt: &'stmt Statement<'stmt>,
+    stmt: Option<&'stmt Statement<'stmt>>,
     current_row: Rc<Cell<c_int>>,
-    failed: bool,
 }
 
 impl<'stmt> Rows<'stmt> {
     fn new(stmt: &'stmt Statement<'stmt>) -> Rows<'stmt> {
         Rows {
-            stmt: stmt,
+            stmt: Some(stmt),
             current_row: Rc::new(Cell::new(0)),
-            failed: false,
         }
     }
 
@@ -1037,31 +1021,47 @@ impl<'stmt> Rows<'stmt> {
             None => Err(Error::QueryReturnedNoRows),
         }
     }
+
+    fn reset(&mut self) {
+        if let Some(stmt) = self.stmt.take() {
+            unsafe {
+                ffi::sqlite3_reset(stmt.stmt);
+            }
+        }
+    }
 }
 
 impl<'stmt> Iterator for Rows<'stmt> {
     type Item = Result<Row<'stmt>>;
 
     fn next(&mut self) -> Option<Result<Row<'stmt>>> {
-        if self.failed {
+        self.stmt.and_then(|stmt| {
-            return None;
+            match unsafe { ffi::sqlite3_step(stmt.stmt) } {
-        }
+                ffi::SQLITE_ROW => {
-        match unsafe { ffi::sqlite3_step(self.stmt.stmt) } {
+                    let current_row = self.current_row.get() + 1;
-            ffi::SQLITE_ROW => {
+                    self.current_row.set(current_row);
-                let current_row = self.current_row.get() + 1;
+                    Some(Ok(Row {
-                self.current_row.set(current_row);
+                        stmt: stmt,
-                Some(Ok(Row {
+                        current_row: self.current_row.clone(),
-                    stmt: self.stmt,
+                        row_idx: current_row,
-                    current_row: self.current_row.clone(),
+                    }))
-                    row_idx: current_row,
+                }
-                }))
+                ffi::SQLITE_DONE => {
+                    self.reset();
+                    None
+                }
+                code => {
+                    self.reset();
+                    Some(Err(stmt.conn.decode_result(code).unwrap_err()))
+                }
             }
-            ffi::SQLITE_DONE => None,
+        })
-            code => {
+    }
-                self.failed = true;
+}
-                Some(Err(self.stmt.conn.decode_result(code).unwrap_err()))
+
-            }
+impl<'stmt> Drop for Rows<'stmt> {
-        }
+    fn drop(&mut self) {
+        self.reset();
     }
 }
 

src/named_params.rs

@@ -113,10 +113,7 @@ impl<'conn> Statement<'conn> {
     ///
     /// Will return `Err` if binding parameters fails.
     pub fn query_named<'a>(&'a mut self, params: &[(&str, &ToSql)]) -> Result<Rows<'a>> {
-        self.reset_if_needed();
         try!(self.bind_parameters_named(params));
-
-        self.needs_reset = true;
         Ok(Rows::new(self))
     }
 
@@ -190,10 +187,9 @@ mod test {
         let mut stmt = db.prepare("INSERT INTO test (x, y) VALUES (:x, :y)").unwrap();
         stmt.execute_named(&[(":x", &"one")]).unwrap();
 
-        let result: Option<String> = db.query_row("SELECT y FROM test WHERE x = 'one'",
+        let result: Option<String> =
-                                                  &[],
+            db.query_row("SELECT y FROM test WHERE x = 'one'", &[], |row| row.get(0))
-                                                  |row| row.get(0))
+                .unwrap();
-                                       .unwrap();
         assert!(result.is_none());
     }
 
@@ -207,10 +203,9 @@ mod test {
         stmt.execute_named(&[(":x", &"one")]).unwrap();
         stmt.execute_named(&[(":y", &"two")]).unwrap();
 
-        let result: String = db.query_row("SELECT x FROM test WHERE y = 'two'",
+        let result: String =
-                                          &[],
+            db.query_row("SELECT x FROM test WHERE y = 'two'", &[], |row| row.get(0))
-                                          |row| row.get(0))
+                .unwrap();
-                               .unwrap();
         assert_eq!(result, "one");
     }
 }

src/trace.rs

@@ -4,7 +4,6 @@ use libc::{c_char, c_int, c_void};
 use std::ffi::{CStr, CString};
 use std::mem;
 use std::ptr;
-use std::str;
 use std::time::Duration;
 
 use super::ffi;

src/types/mod.rs

@@ -379,8 +379,8 @@ mod test {
         let db = checked_memory_handle();
 
         db.execute("INSERT INTO foo(b, t, i, f) VALUES (X'0102', 'text', 1, 1.5)",
-                   &[])
+                     &[])
-          .unwrap();
+            .unwrap();
 
         let mut stmt = db.prepare("SELECT b, t, i, f, n FROM foo").unwrap();
         let mut rows = stmt.query(&[]).unwrap();
@@ -442,8 +442,8 @@ mod test {
         let db = checked_memory_handle();
 
         db.execute("INSERT INTO foo(b, t, i, f) VALUES (X'0102', 'text', 1, 1.5)",
-                   &[])
+                     &[])
-          .unwrap();
+            .unwrap();
 
         let mut stmt = db.prepare("SELECT b, t, i, f, n FROM foo").unwrap();
         let mut rows = stmt.query(&[]).unwrap();