MatheusBaldi
diff --git a/Collapse file
‎package.json‎
Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎package.json‎
Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎src/database.cc‎
Copy file name to clipboardExpand all lines: src/database.cc
+31Lines changed: 31 additions & 0 deletions b/Collapse file
‎src/database.cc‎
Copy file name to clipboardExpand all lines: src/database.cc
+31Lines changed: 31 additions & 0 deletions
diff --git a/Collapse file
‎src/database.h‎
Copy file name to clipboardExpand all lines: src/database.h
+3Lines changed: 3 additions & 0 deletions b/Collapse file
‎src/database.h‎
Copy file name to clipboardExpand all lines: src/database.h
+3Lines changed: 3 additions & 0 deletions
@@ -1,7 +1,7 @@
 {
     "name": "sqlite3",
     "description": "Asynchronous, non-blocking SQLite3 bindings",
-    "version": "2.1.6",
+    "version": "2.1.7-alpha",
     "homepage": "http://github.com/developmentseed/node-sqlite3",
     "author": {
         "name": "Development Seed",
 
@@ -20,6 +20,7 @@ void Database::Init(Handle<Object> target) {
 
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "close", Close);
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "exec", Exec);
+    NODE_SET_PROTOTYPE_METHOD(constructor_template, "wait", Wait);
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "loadExtension", LoadExtension);
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "serialize", Serialize);
     NODE_SET_PROTOTYPE_METHOD(constructor_template, "parallelize", Parallelize);
@@ -550,6 +551,36 @@ void Database::Work_AfterExec(uv_work_t* req) {
     delete baton;
 }
 
+Handle<Value> Database::Wait(const Arguments& args) {
+    HandleScope scope;
+    Database* db = ObjectWrap::Unwrap<Database>(args.This());
+
+    OPTIONAL_ARGUMENT_FUNCTION(0, callback);
+
+    Baton* baton = new Baton(db, callback);
+    db->Schedule(Work_Wait, baton, true);
+
+    return args.This();
+}
+
+void Database::Work_Wait(Baton* baton) {
+    HandleScope scope;
+
+    assert(baton->db->locked);
+    assert(baton->db->open);
+    assert(baton->db->handle);
+    assert(baton->db->pending == 0);
+
+    if (!baton->callback.IsEmpty() && baton->callback->IsFunction()) {
+        Local<Value> argv[] = { Local<Value>::New(Null()) };
+        TRY_CATCH_CALL(baton->db->handle_, baton->callback, 1, argv);
+    }
+
+    baton->db->Process();
+
+    delete baton;
+}
+
 Handle<Value> Database::LoadExtension(const Arguments& args) {
     HandleScope scope;
     Database* db = ObjectWrap::Unwrap<Database>(args.This());
 
@@ -131,6 +131,9 @@ class Database : public ObjectWrap {
     static void Work_Exec(uv_work_t* req);
     static void Work_AfterExec(uv_work_t* req);
 
+    static Handle<Value> Wait(const Arguments& args);
+    static void Work_Wait(Baton* baton);
+
     static Handle<Value> Close(const Arguments& args);
     static void Work_BeginClose(Baton* baton);
     static void Work_Close(uv_work_t* req);