From 880a78ae83293d68b7a245fcf02ca4083c7a3022 Mon Sep 17 00:00:00 2001
From: Gwenael Treguier <gwen@cas75-5-78-192-41-37.fbxo.proxad.net>
Date: Tue, 15 Dec 2015 21:49:59 +0100
Subject: [PATCH] Partial fix following John suggestions.

---
 src/cache.rs | 34 +++++++++++++++++++++++++++-------
 src/lib.rs   | 10 +++++++++-
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/cache.rs b/src/cache.rs
index d0eeede..4f7087c 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -49,22 +49,27 @@ impl<'conn> StatementCache<'conn> {
             return stmt.finalize();
         }
         stmt.reset_if_needed();
-        // clear bindings ???
+        stmt.clear_bindings();
         self.cache.insert(stmt.sql(), stmt).map_or(Ok(()), |stmt| stmt.finalize())
     }
 
     /// Flush the prepared statement cache
-    pub fn flush(&mut self) {
+    pub fn clear(&mut self) {
         self.cache.clear();
     }
 
-    /// Return (current, max) sizes.
-    pub fn size(&self) -> (usize, usize) {
-        (self.cache.len(), self.cache.capacity())
+    /// Return current cache size.
+    pub fn len(&self) -> usize {
+        self.cache.len()
+    }
+
+    /// Return maximum cache size.
+    pub fn capacity(&self) -> usize {
+        self.cache.capacity()
     }
 
     /// Set the maximum number of cached statements.
-    pub fn set_size(&mut self, capacity: usize) {
+    pub fn set_capacity(&mut self, capacity: usize) {
         self.cache.set_capacity(capacity);
     }
 }
@@ -78,13 +83,28 @@ mod test {
     fn test_cache() {
         let db = Connection::open_in_memory().unwrap();
         let mut cache = StatementCache::new(&db, 10);
+        assert_eq!(0, cache.len());
+        assert_eq!(10, cache.capacity());
+
         let sql = "PRAGMA schema_version";
         let mut stmt = cache.get(sql).unwrap();
+        assert_eq!(0, cache.len());
+        assert_eq!(0, stmt.query(&[]).unwrap().get_expected_row().unwrap().get::<i64>(0));
+
         // println!("NEW {:?}", stmt);
         cache.release(stmt, false).unwrap();
+        assert_eq!(1, cache.len());
+
         stmt = cache.get(sql).unwrap();
+        assert_eq!(0, cache.len());
+        assert_eq!(0, stmt.query(&[]).unwrap().get_expected_row().unwrap().get::<i64>(0));
+
         // println!("CACHED {:?}", stmt);
         cache.release(stmt, true).unwrap();
-        cache.flush();
+        assert_eq!(0, cache.len());
+
+        cache.clear();
+        assert_eq!(0, cache.len());
+        assert_eq!(10, cache.capacity());
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 81ff23c..2ea017d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -929,7 +929,15 @@ impl<'conn> Statement<'conn> {
         }
     }
 
-    fn sql(&self) -> String { // TODO Maybe SQL should by kept as an SqliteStatement field ?
+    #[cfg(feature = "cache")]
+    fn clear_bindings(&mut self) {
+        unsafe {
+            ffi::sqlite3_clear_bindings(self.stmt);
+        };
+    }
+
+    #[cfg(feature = "cache")]
+    fn sql(&self) -> String {
         unsafe {
             let c_slice = CStr::from_ptr(ffi::sqlite3_sql(self.stmt)).to_bytes();
             let utf8_str = str::from_utf8(c_slice);