separate .run() and .get() functions

src/statement.cc

@@ -36,6 +36,7 @@ void Statement::Init(v8::Handle<Object> target) {
 
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "bind", Bind);
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "get", Get);
+    NODE_SET_PROTOTYPE_METHOD(constructor_template, "run", Run);
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "reset", Reset);
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "finalize", Finalize);
 
@@ -175,10 +176,7 @@ int Statement::EIO_AfterPrepare(eio_req *req) {
     return 0;
 }
 
-Handle<Value> Statement::Bind(const Arguments& args) {
-    HandleScope scope;
-    Statement* stmt = ObjectWrap::Unwrap<Statement>(args.This());
-
+template <class T> T* Statement::Bind(const Arguments& args) {
     int last = args.Length();
     Local<Function> callback;
     if (last > 0 && args[last - 1]->IsFunction()) {
@@ -186,81 +184,113 @@ Handle<Value> Statement::Bind(const Arguments& args) {
         last--;
     }
 
-    BindBaton* baton = new BindBaton(stmt, callback);
+    T* baton = new T(this, callback);
 
     for (int i = 0; i < last; i++) {
         if (args[i]->IsString()) {
             String::Utf8Value val(args[i]->ToString());
-            baton->values.push_back(new Result::Text(val.length(), *val));
+            baton->parameters.push_back(new Result::Text(val.length(), *val));
         }
         else if (args[i]->IsInt32() || args[i]->IsUint32()) {
-            baton->values.push_back(new Result::Integer(args[i]->Int32Value()));
+            baton->parameters.push_back(new Result::Integer(args[i]->Int32Value()));
         }
         else if (args[i]->IsNumber()) {
-            baton->values.push_back(new Result::Float(args[i]->NumberValue()));
+            baton->parameters.push_back(new Result::Float(args[i]->NumberValue()));
         }
         else if (args[i]->IsBoolean()) {
-            baton->values.push_back(new Result::Integer(args[i]->BooleanValue() ? 1 : 0));
+            baton->parameters.push_back(new Result::Integer(args[i]->BooleanValue() ? 1 : 0));
         }
-        else if (args[i]->IsNull() || args[i]->IsUndefined()) {
-            baton->values.push_back(new Result::Null());
+        else if (args[i]->IsNull()) {
+            baton->parameters.push_back(new Result::Null());
+        }
+        else if (args[i]->IsUndefined()) {
+            // Skip parameter position.
+            baton->parameters.push_back(NULL);
         }
         else {
-            return ThrowException(Exception::Error(String::New("Data type is not supported")));
+            delete baton;
+            return NULL;
         }
     }
 
-    stmt->Schedule(EIO_BeginBind, baton);
-
-    return args.This();
+    return baton;
 }
 
-void Statement::EIO_BeginBind(Baton* baton) {
-    assert(!baton->stmt->locked);
-    assert(!baton->stmt->finalized);
-    assert(baton->stmt->prepared);
-    baton->stmt->locked = true;
-    eio_custom(EIO_Bind, EIO_PRI_DEFAULT, EIO_AfterBind, baton);
-}
+bool Statement::Bind(const Result::Row parameters) {
+    if (parameters.size() == 0) {
+        return true;
+    }
 
-int Statement::EIO_Bind(eio_req *req) {
-    STATEMENT_INIT(BindBaton);
+    sqlite3_reset(handle);
+    sqlite3_clear_bindings(handle);
 
-    sqlite3_mutex* mtx = sqlite3_db_mutex(stmt->db->handle);
-    sqlite3_mutex_enter(mtx);
+    Result::Row::const_iterator it = parameters.begin();
+    Result::Row::const_iterator end = parameters.end();
 
-    Result::Row::iterator it = baton->values.begin();
     // Note: bind parameters start with 1.
-    for (int i = 1; it < baton->values.end(); it++, i++) {
+    for (int i = 1; it < end; it++, i++) {
         Result::Field* field = *it;
+        if (field == NULL) {
+            continue;
+        }
+
         switch (field->type) {
             case SQLITE_INTEGER: {
-                stmt->status = sqlite3_bind_int(stmt->handle, i,
-                    ((Result::Integer*)field)->value);
+                status = sqlite3_bind_int(handle, i, ((Result::Integer*)field)->value);
             } break;
             case SQLITE_FLOAT: {
-                stmt->status = sqlite3_bind_double(stmt->handle, i,
-                    ((Result::Float*)field)->value);
+                status = sqlite3_bind_double(handle, i, ((Result::Float*)field)->value);
             } break;
             case SQLITE_TEXT: {
-                stmt->status = sqlite3_bind_text(
-                    stmt->handle, i, ((Result::Text*)field)->value.c_str(),
+                status = sqlite3_bind_text(
+                    handle, i, ((Result::Text*)field)->value.c_str(),
                     ((Result::Text*)field)->value.size(), SQLITE_TRANSIENT);
             } break;
             // case SQLITE_BLOB: {
             //
             // } break;
             case SQLITE_NULL: {
-                stmt->status = sqlite3_bind_null(stmt->handle, i);
+                status = sqlite3_bind_null(handle, i);
             } break;
         }
 
-        if (stmt->status != SQLITE_OK) {
-            stmt->message = std::string(sqlite3_errmsg(stmt->db->handle));
-            break;
+        if (status != SQLITE_OK) {
+            message = std::string(sqlite3_errmsg(db->handle));
+            return false;
         }
     }
 
+    return true;
+}
+
+Handle<Value> Statement::Bind(const Arguments& args) {
+    HandleScope scope;
+    Statement* stmt = ObjectWrap::Unwrap<Statement>(args.This());
+
+    Baton* baton = stmt->Bind<Baton>(args);
+    if (baton == NULL) {
+        return ThrowException(Exception::Error(String::New("Data type is not supported")));
+    }
+    else {
+        stmt->Schedule(EIO_BeginBind, baton);
+        return args.This();
+    }
+}
+
+void Statement::EIO_BeginBind(Baton* baton) {
+    assert(!baton->stmt->locked);
+    assert(!baton->stmt->finalized);
+    assert(baton->stmt->prepared);
+    baton->stmt->locked = true;
+    eio_custom(EIO_Bind, EIO_PRI_DEFAULT, EIO_AfterBind, baton);
+}
+
+int Statement::EIO_Bind(eio_req *req) {
+    STATEMENT_INIT(Baton);
+
+    sqlite3_mutex* mtx = sqlite3_db_mutex(stmt->db->handle);
+    sqlite3_mutex_enter(mtx);
+    stmt->Bind(baton->parameters);
     sqlite3_mutex_leave(mtx);
 
     return 0;
@@ -268,7 +298,7 @@ int Statement::EIO_Bind(eio_req *req) {
 
 int Statement::EIO_AfterBind(eio_req *req) {
     HandleScope scope;
-    STATEMENT_INIT(BindBaton);
+    STATEMENT_INIT(Baton);
 
     if (stmt->status != SQLITE_OK) {
         Error(baton);
@@ -291,9 +321,7 @@ Handle<Value> Statement::Get(const Arguments& args) {
     HandleScope scope;
     Statement* stmt = ObjectWrap::Unwrap<Statement>(args.This());
 
-    OPTIONAL_ARGUMENT_FUNCTION(0, callback);
-
-    RowBaton* baton = new RowBaton(stmt, callback);
+    Baton* baton = stmt->Bind<RowBaton>(args);
     stmt->Schedule(EIO_BeginGet, baton);
 
     return args.This();
@@ -311,15 +339,15 @@ int Statement::EIO_Get(eio_req *req) {
     STATEMENT_INIT(RowBaton);
 
     if (stmt->status != SQLITE_DONE) {
-        // In case preparing fails, we use a mutex to make sure we get the associated
-        // error message.
         sqlite3_mutex* mtx = sqlite3_db_mutex(stmt->db->handle);
         sqlite3_mutex_enter(mtx);
 
-        stmt->status = sqlite3_step(stmt->handle);
+        if (stmt->Bind(baton->parameters)) {
+            stmt->status = sqlite3_step(stmt->handle);
 
-        if (!(stmt->status == SQLITE_ROW || stmt->status == SQLITE_DONE)) {
-            stmt->message = std::string(sqlite3_errmsg(stmt->db->handle));
+            if (!(stmt->status == SQLITE_ROW || stmt->status == SQLITE_DONE)) {
+                stmt->message = std::string(sqlite3_errmsg(stmt->db->handle));
+            }
         }
 
         sqlite3_mutex_leave(mtx);
@@ -359,6 +387,64 @@ int Statement::EIO_AfterGet(eio_req *req) {
     return 0;
 }
 
+Handle<Value> Statement::Run(const Arguments& args) {
+    HandleScope scope;
+    Statement* stmt = ObjectWrap::Unwrap<Statement>(args.This());
+
+    OPTIONAL_ARGUMENT_FUNCTION(0, callback);
+
+    Baton* baton = new Baton(stmt, callback);
+    stmt->Schedule(EIO_BeginRun, baton);
+
+    return args.This();
+}
+
+void Statement::EIO_BeginRun(Baton* baton) {
+    assert(!baton->stmt->locked);
+    assert(!baton->stmt->finalized);
+    assert(baton->stmt->prepared);
+    baton->stmt->locked = true;
+    eio_custom(EIO_Run, EIO_PRI_DEFAULT, EIO_AfterRun, baton);
+}
+
+int Statement::EIO_Run(eio_req *req) {
+    STATEMENT_INIT(Baton);
+
+    sqlite3_reset(stmt->handle);
+
+    sqlite3_mutex* mtx = sqlite3_db_mutex(stmt->db->handle);
+    sqlite3_mutex_enter(mtx);
+
+    stmt->status = sqlite3_step(stmt->handle);
+
+    if (!(stmt->status == SQLITE_ROW || stmt->status == SQLITE_DONE)) {
+        stmt->message = std::string(sqlite3_errmsg(stmt->db->handle));
+    }
+
+    sqlite3_mutex_leave(mtx);
+
+    return 0;
+}
+
+int Statement::EIO_AfterRun(eio_req *req) {
+    HandleScope scope;
+    STATEMENT_INIT(Baton);
+
+    if (stmt->status != SQLITE_ROW && stmt->status != SQLITE_DONE) {
+        Error(baton);
+    }
+    else {
+        // Fire callbacks.
+        if (!baton->callback.IsEmpty() && baton->callback->IsFunction()) {
+            Local<Value> argv[] = { Local<Value>::New(Null()) };
+            TRY_CATCH_CALL(stmt->handle_, baton->callback, 1, argv);
+        }
+    }
+
+    STATEMENT_END();
+    return 0;
+}
+
 Handle<Value> Statement::Reset(const Arguments& args) {
     HandleScope scope;
     Statement* stmt = ObjectWrap::Unwrap<Statement>(args.This());

src/statement.h

@@ -82,6 +82,7 @@ public:
     static struct Baton {
         Statement* stmt;
         Persistent<Function> callback;
+        Result::Row parameters;
 
         Baton(Statement* stmt_, Handle<Function> cb_) : stmt(stmt_) {
             stmt->Ref();
@@ -95,12 +96,6 @@ public:
         }
     };
 
-    static struct BindBaton : Baton {
-        BindBaton(Statement* stmt_, Handle<Function> cb_) :
-            Baton(stmt_, cb_) {}
-        Result::Row values;
-    };
-
     static struct RowBaton : Baton {
         RowBaton(Statement* stmt_, Handle<Function> cb_) :
             Baton(stmt_, cb_) {}
@@ -149,19 +144,23 @@ protected:
 
     EIO_DEFINITION(Bind);
     EIO_DEFINITION(Get);
+    EIO_DEFINITION(Run);
     EIO_DEFINITION(Reset);
 
+    static Handle<Value> Finalize(const Arguments& args);
+    static void Finalize(Baton* baton);
+    void Finalize();
+
+    template <class T> T* Bind(const Arguments& args);
+    bool Bind(const Result::Row parameters);
+
     static void GetRow(Result::Row* row, sqlite3_stmt* stmt);
     static Local<Array> RowToJS(Result::Row* row);
-
     void Schedule(EIO_Callback callback, Baton* baton);
     void Process();
     void CleanQueue();
-
-    static Handle<Value> Finalize(const Arguments& args);
-    static void Finalize(Baton* baton);
     template <class T> static void Error(T* baton);
-    void Finalize();
+
 protected:
     Database* db;
 

test/prepare.test.js

@@ -23,7 +23,7 @@ exports['test simple prepared statement'] = function(beforeExit) {
     var run = false;
     var db = new sqlite3.Database(':memory:');
     db.prepare("CREATE TABLE foo (text bar)")
-        .get(function(err) {
+        .run(function(err) {
             if (err) throw err;
             run = true;
         })
@@ -46,7 +46,7 @@ exports['test inserting and retrieving rows'] = function(beforeExit) {
 
     Step(
         function() {
-            db.prepare("CREATE TABLE foo (txt text, num int, flt float, blb blob)").get(this);
+            db.prepare("CREATE TABLE foo (txt text, num int, flt float, blb blob)").run(this);
         },
         function(err) {
             if (err) throw err;
@@ -58,7 +58,7 @@ exports['test inserting and retrieving rows'] = function(beforeExit) {
                       i,
                       i * Math.PI
                       // null (SQLite sets this implicitly)
-                ).get(group());
+                ).run(group());
             }
         },
         function(err, rows) {
@@ -126,3 +126,35 @@ exports['test retrieving reset() function'] = function(beforeExit) {
         assert.equal(10, retrieved, "Didn't retrieve all rows");
     });
 };
+
+exports['test get() function binding'] = function(beforeExit) {
+    var db = new sqlite3.Database('test/support/prepare.db', sqlite3.OPEN_READONLY);
+
+    var retrieved = 0;
+
+    Step(
+        function() {
+            var stmt = db.prepare("SELECT txt, num, flt, blb FROM foo WHERE num = ?");
+
+            var group = this.group();
+            for (var i = 0; i < 10; i++) {
+                stmt.get(i * 10 + 1, group());
+            }
+        },
+        function(err, rows) {
+            if (err) throw err;
+            for (var i = 0; i < rows.length; i++) {
+                var val = i * 10 + 1;
+                assert.equal(rows[i][0], 'String ' + val);
+                assert.equal(rows[i][1], val);
+                assert.equal(rows[i][2], val * Math.PI);
+                assert.equal(rows[i][3], null);
+                retrieved++;
+            }
+        }
+    );
+
+    beforeExit(function() {
+        assert.equal(10, retrieved, "Didn't retrieve all rows");
+    });
+};