Rename Cursor to Statement

Introduces a more sensible name for this set of functionality and frees
`Cursor` to be used for result sets.

Author: aflatter

src/sqlite3/database.rs

@@ -29,7 +29,7 @@
 ** POSSIBILITY OF SUCH DAMAGE.
 */
 
-use cursor::*;
+use statement::*;
 use ffi::*;
 use libc::c_int;
 use std::ptr;
@@ -68,7 +68,7 @@ impl Database {
 
     /// Prepares/compiles an SQL statement.
     /// See http://www.sqlite.org/c3ref/prepare.html
-    pub fn prepare<'db>(&'db self, sql: &str, _tail: &Option<&str>) -> SqliteResult<Cursor<'db>> {
+    pub fn prepare<'db>(&'db self, sql: &str, _tail: &Option<&str>) -> SqliteResult<Statement<'db>> {
         let new_stmt = ptr::null();
         let r = sql.with_c_str( |_sql| {
             unsafe {
@@ -77,7 +77,7 @@ impl Database {
         });
         if r == SQLITE_OK {
             debug!("`Database.prepare()`: stmt={:?}", new_stmt);
-            Ok(Cursor::new(new_stmt, &self.dbh))
+            Ok(Statement::new(new_stmt, &self.dbh))
         } else {
             Err(r)
         }

src/sqlite3/lib.rs

@@ -37,13 +37,13 @@
 extern crate libc;
 extern crate collections;
 
-pub use cursor::*;
+pub use statement::*;
 pub use database::*;
 use ffi::*;
 pub use types::*;
 use std::ptr;
 
-pub mod cursor;
+pub mod statement;
 pub mod database;
 mod ffi;
 
@@ -95,12 +95,12 @@ pub fn open(path: &str) -> SqliteResult<Database> {
 
 #[cfg(test)]
 mod tests {
-    use cursor::*;
+    use statement::*;
     use database::*;
     use super::*;
     use types::*;
 
-    fn checked_prepare<'db>(database: &'db Database, sql: &str) -> Cursor<'db> {
+    fn checked_prepare<'db>(database: &'db Database, sql: &str) -> Statement<'db> {
         match database.prepare(sql, &None) {
             Ok(s)  => s,
             Err(x) => fail!(format!("sqlite error: \"{}\" ({:?})", database.get_errmsg(), x)),

src/sqlite3/cursor.rs renamed to src/sqlite3/statement.rs

@@ -36,28 +36,28 @@ use std::str;
 use std::slice;
 use types::*;
 
-/// The database cursor.
-pub struct Cursor<'db> {
+/// A prepared statement.
+pub struct Statement<'db> {
     stmt: *stmt,
     dbh: &'db *dbh
 }
 
 #[unsafe_destructor]
-impl<'db> Drop for Cursor<'db> {
+impl<'db> Drop for Statement<'db> {
     /// Deletes a prepared SQL statement.
     /// See http://www.sqlite.org/c3ref/finalize.html
     fn drop(&mut self) {
-        debug!("`Cursor.drop()`: stmt={:?}", self.stmt);
+        debug!("`Statement.drop()`: stmt={:?}", self.stmt);
         unsafe {
             sqlite3_finalize(self.stmt);
         }
     }
 }
 
-impl<'db> Cursor<'db> {
-    pub fn new<'dbh>(stmt: *stmt, dbh: &'dbh *dbh) -> Cursor<'dbh> {
-        debug!("`Cursor.new()`: stmt={:?}", stmt);
-        Cursor { stmt: stmt, dbh: dbh }
+impl<'db> Statement<'db> {
+    pub fn new<'dbh>(stmt: *stmt, dbh: &'dbh *dbh) -> Statement<'dbh> {
+        debug!("`Statement.new()`: stmt={:?}", stmt);
+        Statement { stmt: stmt, dbh: dbh }
     }
 
     /// Resets a prepared SQL statement, but does not reset its bindings.
@@ -241,7 +241,7 @@ impl<'db> Cursor<'db> {
     /// See http://www.sqlite.org/c3ref/bind_blob.html
     pub fn bind_param(&self, i: int, value: &BindArg) -> ResultCode {
 
-        debug!("`Cursor.bind_param()`: stmt={:?}", self.stmt);
+        debug!("`Statement.bind_param()`: stmt={:?}", self.stmt);
 
         let r = match *value {
             Text(ref v) => {