Merge branch 'dynamic' of https://github.com/gwenn/rusqlite into gwenn-dynamic

src/lib.rs

@@ -728,6 +728,11 @@ impl<'conn> Statement<'conn> {
         cols
     }
 
+    /// Return the number of columns in the result set returned by the prepared statement.
+    pub fn column_count(&self) -> i32 {
+        self.column_count
+    }
+
     /// Returns the column index in the result set for a given column name.
     /// If there is no AS clause then the name of the column is unspecified and may change from one release of SQLite to the next.
     ///
@@ -1131,6 +1136,11 @@ impl<'stmt> Row<'stmt> {
             }
         }
     }
+
+    /// Return the number of columns in the current row.
+    pub fn column_count(&self) -> i32 {
+        self.stmt.column_count()
+    }
 }
 
 /// A trait implemented by types that can index into columns of a row.
@@ -1267,9 +1277,11 @@ mod test {
         db.execute_batch("CREATE TABLE foo(x INTEGER);").unwrap();
 
         let stmt = db.prepare("SELECT * FROM foo").unwrap();
+        assert_eq!(stmt.column_count(), 1);
         assert_eq!(stmt.column_names(), vec!["x"]);
 
         let stmt = db.prepare("SELECT x AS a, x AS b FROM foo").unwrap();
+        assert_eq!(stmt.column_count(), 2);
         assert_eq!(stmt.column_names(), vec!["a", "b"]);
     }
 
@@ -1668,5 +1680,17 @@ mod test {
             }
         }
 
+        #[test]
+        #[cfg_attr(rustfmt, rustfmt_skip)]
+        fn test_dynamic() {
+            let db = checked_memory_handle();
+            let sql = "BEGIN;
+                       CREATE TABLE foo(x INTEGER, y TEXT);
+                       INSERT INTO foo VALUES(4, \"hello\");
+                       END;";
+            db.execute_batch(sql).unwrap();
+
+            db.query_row("SELECT * FROM foo", &[], |r| assert_eq!(2, r.column_count())).unwrap();
+        }
     }
 }