Merge pull request #630 from mapbox/revert-518-master

Revert "Add support for sqlite3_interrupt"

src/database.cc

@@ -23,7 +23,6 @@ NAN_MODULE_INIT(Database::Init) {
     Nan::SetPrototypeMethod(t, "serialize", Serialize);
     Nan::SetPrototypeMethod(t, "parallelize", Parallelize);
     Nan::SetPrototypeMethod(t, "configure", Configure);
-    Nan::SetPrototypeMethod(t, "interrupt", Interrupt);
 
     NODE_SET_GETTER(t, "open", OpenGetter);
 
@@ -225,8 +224,6 @@ void Database::Work_BeginClose(Baton* baton) {
     assert(baton->db->pending == 0);
 
     baton->db->RemoveCallbacks();
-    baton->db->closing = true;
-
     int status = uv_queue_work(uv_default_loop(),
         &baton->request, Work_Close, (uv_after_work_cb)Work_AfterClose);
     assert(status == 0);
@@ -252,8 +249,6 @@ void Database::Work_AfterClose(uv_work_t* req) {
     Baton* baton = static_cast<Baton*>(req->data);
     Database* db = baton->db;
 
-    db->closing = false;
-
     Local<Value> argv[1];
     if (baton->status != SQLITE_OK) {
         EXCEPTION(Nan::New(baton->message.c_str()).ToLocalChecked(), baton->status, exception);
@@ -356,21 +351,6 @@ NAN_METHOD(Database::Configure) {
     info.GetReturnValue().Set(info.This());
 }
 
-NAN_METHOD(Database::Interrupt) {
-    Database* db = Nan::ObjectWrap::Unwrap<Database>(info.This());
-
-    if (!db->open) {
-        return Nan::ThrowError("Database is not open");
-    }
-
-    if (db->closing) {
-        return Nan::ThrowError("Database is closing");
-    }
-
-    sqlite3_interrupt(db->_handle);
-    info.GetReturnValue().Set(info.This());
-}
-
 void Database::SetBusyTimeout(Baton* baton) {
     assert(baton->db->open);
     assert(baton->db->_handle);

src/database.h

@@ -104,7 +104,6 @@ class Database : public Nan::ObjectWrap {
         _handle(NULL),
         open(false),
         locked(false),
-        closing(false),
         pending(0),
         serialize(false),
         debug_trace(NULL),
@@ -152,8 +151,6 @@ class Database : public Nan::ObjectWrap {
 
     static NAN_METHOD(Configure);
 
-    static NAN_METHOD(Interrupt);
-
     static void SetBusyTimeout(Baton* baton);
 
     static void RegisterTraceCallback(Baton* baton);
@@ -174,7 +171,6 @@ class Database : public Nan::ObjectWrap {
     sqlite3* _handle;
 
     bool open;
-    bool closing;
     bool locked;
     unsigned int pending;