From 1dc78b66da8b135e4e214ad49076f92a6a065f3e Mon Sep 17 00:00:00 2001
From: John Gallagher <jgallagher@bignerdranch.com>
Date: Fri, 6 Feb 2015 20:07:23 -0500
Subject: [PATCH] `SqliteConnection::open` takes a `std::path`.

Add new constructors, `open_in_memory` and `open_in_memory_with_flags`,
for opening in-memory databases.

Closes #13.
---
 src/lib.rs         | 45 ++++++++++++++++++++++++++++++---------------
 src/transaction.rs |  2 +-
 src/types.rs       |  2 +-
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index cb1a4f6..86fa073 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,7 @@
 //! }
 //!
 //! fn main() {
-//!     let conn = SqliteConnection::open(":memory:").unwrap();
+//!     let conn = SqliteConnection::open_in_memory().unwrap();
 //!
 //!     conn.execute("CREATE TABLE person (
 //!                   id              INTEGER PRIMARY KEY,
@@ -55,11 +55,13 @@ extern crate libc;
 #[macro_use] extern crate rustc_bitflags;
 
 use std::mem;
+use std::path;
 use std::ptr;
 use std::fmt;
 use std::rc::{Rc};
 use std::cell::{RefCell, Cell};
-use std::ffi::{CString};
+use std::ffi::{CString, AsOsStr};
+use std::os::unix::{OsStrExt};
 use std::ffi as std_ffi;
 use std::str;
 use libc::{c_int, c_void, c_char};
@@ -133,21 +135,36 @@ pub struct SqliteConnection {
 impl SqliteConnection {
     /// Open a new connection to a SQLite database.
     ///
-    /// Use the special path `:memory:` to create an in-memory database.
     /// `SqliteConnection::open(path)` is equivalent to `SqliteConnection::open_with_flags(path,
     /// SQLITE_OPEN_READ_WRITE | SQLITE_OPEN_CREATE)`.
-    pub fn open(path: &str) -> SqliteResult<SqliteConnection> {
+    pub fn open(path: &path::Path) -> SqliteResult<SqliteConnection> {
         let flags = SQLITE_OPEN_READ_WRITE | SQLITE_OPEN_CREATE;
         SqliteConnection::open_with_flags(path, flags)
     }
 
+    /// Open a new connection to an in-memory SQLite database.
+    pub fn open_in_memory() -> SqliteResult<SqliteConnection> {
+        let flags = SQLITE_OPEN_READ_WRITE | SQLITE_OPEN_CREATE;
+        SqliteConnection::open_in_memory_with_flags(flags)
+    }
+
     /// Open a new connection to a SQLite database.
     ///
-    /// Use the special path `:memory:` to create an in-memory database. See [Opening A New
     /// Database Connection](http://www.sqlite.org/c3ref/open.html) for a description of valid
     /// flag combinations.
-    pub fn open_with_flags(path: &str, flags: SqliteOpenFlags) -> SqliteResult<SqliteConnection> {
-        InnerSqliteConnection::open_with_flags(path, flags).map(|db| {
+    pub fn open_with_flags(path: &path::Path, flags: SqliteOpenFlags)
+            -> SqliteResult<SqliteConnection> {
+        InnerSqliteConnection::open_with_flags(path.as_os_str().as_byte_slice(), flags).map(|db| {
+            SqliteConnection{ db: RefCell::new(db) }
+        })
+    }
+
+    /// Open a new connection to an in-memory SQLite database.
+    ///
+    /// Database Connection](http://www.sqlite.org/c3ref/open.html) for a description of valid
+    /// flag combinations.
+    pub fn open_in_memory_with_flags(flags: SqliteOpenFlags) -> SqliteResult<SqliteConnection> {
+        InnerSqliteConnection::open_with_flags(":memory:".as_bytes(), flags).map(|db| {
             SqliteConnection{ db: RefCell::new(db) }
         })
     }
@@ -351,8 +368,9 @@ bitflags! {
 }
 
 impl InnerSqliteConnection {
-    fn open_with_flags(path: &str, flags: SqliteOpenFlags) -> SqliteResult<InnerSqliteConnection> {
-        let c_path = CString::from_slice(path.as_bytes());
+    fn open_with_flags(path: &[u8], flags: SqliteOpenFlags)
+            -> SqliteResult<InnerSqliteConnection> {
+        let c_path = CString::from_slice(path);
         unsafe {
             let mut db: *mut ffi::sqlite3 = mem::uninitialized();
             let r = ffi::sqlite3_open_v2(c_path.as_ptr(), &mut db, flags.bits(), ptr::null());
@@ -700,12 +718,12 @@ mod test {
     use super::*;
 
     fn checked_memory_handle() -> SqliteConnection {
-        SqliteConnection::open(":memory:").unwrap()
+        SqliteConnection::open_in_memory().unwrap()
     }
 
     #[test]
     fn test_open() {
-        assert!(SqliteConnection::open(":memory:").is_ok());
+        assert!(SqliteConnection::open_in_memory().is_ok());
 
         let db = checked_memory_handle();
         assert!(db.close().is_ok());
@@ -718,11 +736,8 @@ mod test {
             SQLITE_OPEN_READ_ONLY | SQLITE_OPEN_READ_WRITE,
             SQLITE_OPEN_READ_ONLY | SQLITE_OPEN_CREATE,
         ].iter() {
-            assert!(SqliteConnection::open_with_flags(":memory:", *bad_flags).is_err());
+            assert!(SqliteConnection::open_in_memory_with_flags(*bad_flags).is_err());
         }
-
-        assert!(SqliteConnection::open_with_flags(
-                "file::memory:", SQLITE_OPEN_READ_ONLY|SQLITE_OPEN_URI).is_ok());
     }
 
     #[test]
diff --git a/src/transaction.rs b/src/transaction.rs
index 27f20df..9e151b3 100644
--- a/src/transaction.rs
+++ b/src/transaction.rs
@@ -163,7 +163,7 @@ mod test {
     use SqliteConnection;
 
     fn checked_memory_handle() -> SqliteConnection {
-        let db = SqliteConnection::open(":memory:").unwrap();
+        let db = SqliteConnection::open_in_memory().unwrap();
         db.execute_batch("CREATE TABLE foo (x INTEGER)").unwrap();
         db
     }
diff --git a/src/types.rs b/src/types.rs
index b63c03a..a187a76 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -228,7 +228,7 @@ mod test {
     use super::time;
 
     fn checked_memory_handle() -> SqliteConnection {
-        let db = SqliteConnection::open(":memory:").unwrap();
+        let db = SqliteConnection::open_in_memory().unwrap();
         db.execute_batch("CREATE TABLE foo (b BLOB, t TEXT)").unwrap();
         db
     }