From 5ac5f3e9b597660ddc28df702650b08ce02469fc Mon Sep 17 00:00:00 2001
From: John Gallagher <jgallagher@bignerdranch.com>
Date: Mon, 14 Dec 2015 13:38:36 -0500
Subject: [PATCH] Make `blob_open` take a `DatabaseName` instead of a str.

---
 src/blob.rs | 14 +++++++-------
 src/lib.rs  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/blob.rs b/src/blob.rs
index 30b4c2e..2227045 100644
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -3,7 +3,7 @@ use std::mem;
 use std::ptr;
 
 use super::ffi;
-use {Error, Result, Connection};
+use {Error, Result, Connection, DatabaseName};
 
 /// Handle to an open BLOB
 pub struct Blob<'conn> {
@@ -20,14 +20,14 @@ pub enum SeekFrom {
 }
 
 impl Connection {
-    /// Open a handle to the BLOB located in `row`, `column`, `table` in database `db` ('main', 'temp', ...)
+    /// Open a handle to the BLOB located in `row`, `column`, `table` in database `db`.
     ///
     /// # Failure
     ///
     /// Will return `Err` if `db`/`table`/`column` cannot be converted to a C-compatible string or if the
     /// underlying SQLite BLOB open call fails.
     pub fn blob_open<'a>(&'a self,
-                         db: &str,
+                         db: DatabaseName,
                          table: &str,
                          column: &str,
                          row: i64,
@@ -35,7 +35,7 @@ impl Connection {
                          -> Result<Blob<'a>> {
         let mut c = self.db.borrow_mut();
         let mut blob = ptr::null_mut();
-        let db = try!(super::str_to_cstring(db));
+        let db = try!(db.to_cstring());
         let table = try!(super::str_to_cstring(table));
         let column = try!(super::str_to_cstring(column));
         let rc = unsafe {
@@ -179,7 +179,7 @@ impl<'conn> Drop for Blob<'conn> {
 
 #[cfg(test)]
 mod test {
-    use Connection;
+    use {Connection, DatabaseName};
 
     #[test]
     #[cfg_attr(rustfmt, rustfmt_skip)]
@@ -192,7 +192,7 @@ mod test {
         db.execute_batch(sql).unwrap();
         let rowid = db.last_insert_rowid();
 
-        let mut blob = db.blob_open("main", "test", "content", rowid, false).unwrap();
+        let mut blob = db.blob_open(DatabaseName::Main, "test", "content", rowid, false).unwrap();
         blob.write(b"Clob").unwrap();
         let err = blob.write(b"5678901");
         // writeln!(io::stderr(), "{:?}", err);
@@ -201,7 +201,7 @@ mod test {
         assert!(blob.reopen(rowid).is_ok());
         assert!(blob.close().is_ok());
 
-        blob = db.blob_open("main", "test", "content", rowid, true).unwrap();
+        blob = db.blob_open(DatabaseName::Main, "test", "content", rowid, true).unwrap();
         let mut bytes = [0u8; 5];
         assert_eq!(5, blob.read(&mut bytes[..]).unwrap());
         assert_eq!(5, blob.read(&mut bytes[..]).unwrap());
diff --git a/src/lib.rs b/src/lib.rs
index f0451c2..e41dc91 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -171,9 +171,9 @@ pub enum DatabaseName<'a> {
     Attached(&'a str),
 }
 
-// Currently DatabaseName is only used by the backup mod, so hide this (private)
+// Currently DatabaseName is only used by the backup and blob mods, so hide this (private)
 // impl to avoid dead code warnings.
-#[cfg(feature = "backup")]
+#[cfg(any(feature = "backup", feature = "blob"))]
 impl<'a> DatabaseName<'a> {
     fn to_cstring(self) -> Result<CString> {
         use self::DatabaseName::{Main, Temp, Attached};