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

Changelog.md

@@ -1,3 +1,8 @@
+# Version UPCOMING (TBD)
+
+* BREAKING CHANGE: `Connection::close()` now returns a `Result<(), (Connection, Error)>` instead
+  of a `Result<(), Error>` so callers get the still-open connection back on failure.
+
 # Version 0.8.0 (2016-12-31)
 
 * BREAKING CHANGE: The `FromSql` trait has been redesigned. It now requires a single, safe

build.rs

@@ -1,5 +0,0 @@
-extern crate pkg_config;
-
-fn main() {
-    pkg_config::find_library("sqlite3").unwrap();
-}

src/lib.rs

@@ -79,9 +79,14 @@ use error::{error_from_sqlite_code, error_from_handle};
 use raw_statement::RawStatement;
 use cache::StatementCache;
 
-pub use transaction::{SqliteTransaction, SqliteTransactionBehavior, DropBehavior, Savepoint,
-                      Transaction, TransactionBehavior};
-pub use error::{SqliteError, Error};
+#[allow(deprecated)]
+pub use transaction::{SqliteTransaction, SqliteTransactionBehavior};
+pub use transaction::{DropBehavior, Savepoint, Transaction, TransactionBehavior};
+
+#[allow(deprecated)]
+pub use error::SqliteError;
+pub use error::Error;
+
 pub use cache::CachedStatement;
 
 #[cfg(feature = "load_extension")]
@@ -405,15 +410,19 @@ impl Connection {
     /// Close the SQLite connection.
     ///
     /// This is functionally equivalent to the `Drop` implementation for `Connection` except
-    /// that it returns any error encountered to the caller.
+    /// that on failure, it returns an error and the connection itself (presumably so closing
+    /// can be attempted again).
     ///
     /// # Failure
     ///
     /// Will return `Err` if the underlying SQLite call fails.
-    pub fn close(self) -> Result<()> {
+    pub fn close(self) -> std::result::Result<(), (Connection, Error)> {
         self.flush_prepared_statement_cache();
-        let mut db = self.db.borrow_mut();
-        db.close()
+        {
+            let mut db = self.db.borrow_mut();
+            db.close()
+        }
+        .map_err(move |err| (self, err))
     }
 
     /// Enable loading of SQLite extensions. Strongly consider using `LoadExtensionGuard`
@@ -1251,6 +1260,42 @@ mod test {
         assert!(db.close().is_ok());
     }
 
+    #[test]
+    fn test_close_retry() {
+        let db = checked_memory_handle();
+
+        // force the DB to be busy by preparing a statement; this must be done at the FFI
+        // level to allow us to call .close() without dropping the prepared statement first.
+        let raw_stmt = {
+            use std::mem;
+            use std::ptr;
+            use libc::c_int;
+            use super::str_to_cstring;
+
+            let raw_db = db.db.borrow_mut().db;
+            let sql = "SELECT 1";
+            let mut raw_stmt: *mut ffi::sqlite3_stmt = unsafe { mem::uninitialized() };
+            let rc = unsafe {
+                ffi::sqlite3_prepare_v2(raw_db,
+                                        str_to_cstring(sql).unwrap().as_ptr(),
+                                        (sql.len() + 1) as c_int,
+                                        &mut raw_stmt,
+                                        ptr::null_mut())
+            };
+            assert_eq!(rc, ffi::SQLITE_OK);
+            raw_stmt
+        };
+
+        let result = db.close();
+        assert!(result.is_err());
+
+        // finalize the open statement so a second close will succeed
+        assert_eq!(ffi::SQLITE_OK, unsafe { ffi::sqlite3_finalize(raw_stmt) });
+
+        let (db, _) = result.unwrap_err();
+        db.close().unwrap();
+    }
+
     #[test]
     fn test_open_with_flags() {
         for bad_flags in &[OpenFlags::empty(),