@op-engineering/op-sqlite 9.1.1 → 9.1.3

package/cpp/DBHostObject.cpp

@@ -333,6 +333,10 @@ void DBHostObject::create_jsi_functions() {
           auto status = opsqlite_execute_raw(db_name, query, &params, &results);
 #endif
 
+          if (invalidated) {
+            return;
+          }
+
           invoker->invokeAsync([&rt, results = std::move(results),
                                 status = std::move(status), resolve, reject] {
             if (status.type == SQLiteOk) {
@@ -379,8 +383,9 @@ void DBHostObject::create_jsi_functions() {
       auto resolve = std::make_shared<jsi::Value>(rt, args[0]);
       auto reject = std::make_shared<jsi::Value>(rt, args[1]);
 
-      auto task = [&rt, this, query = std::move(query), params = std::move(params), resolve,
-                   reject, invoker = this->jsCallInvoker]() {
+      auto task = [&rt, this, query = std::move(query),
+                   params = std::move(params), resolve, reject,
+                   invoker = this->jsCallInvoker]() {
         try {
 
 #ifdef OP_SQLITE_USE_LIBSQL
@@ -389,9 +394,9 @@ void DBHostObject::create_jsi_functions() {
           auto status = opsqlite_execute(db_name, query, &params);
 #endif
 
-          //            if (invalidated) {
-          //              return;
-          //            }
+          if (invalidated) {
+            return;
+          }
 
           invoker->invokeAsync([&rt, status = std::move(status), resolve,
                                 reject] {
@@ -455,9 +460,9 @@ void DBHostObject::create_jsi_functions() {
                                                       &results, metadata);
 #endif
 
-          //            if (invalidated) {
-          //              return;
-          //            }
+          if (invalidated) {
+            return;
+          }
 
           invoker->invokeAsync(
               [&rt,
@@ -533,6 +538,11 @@ void DBHostObject::create_jsi_functions() {
 #else
           auto batchResult = opsqlite_execute_batch(db_name, commands.get());
 #endif
+
+          if (invalidated) {
+            return;
+          }
+
           jsCallInvoker->invokeAsync([&rt, batchResult = std::move(batchResult),
                                       resolve, reject] {
             if (batchResult.type == SQLiteOk) {
@@ -934,4 +944,8 @@ void DBHostObject::set(jsi::Runtime &rt, const jsi::PropNameID &name,
   throw std::runtime_error("You cannot write to this object!");
 }
 
+void DBHostObject::invalidate() { invalidated = true; }
+
+DBHostObject::~DBHostObject() { invalidated = true; }
+
 } // namespace opsqlite

package/cpp/DBHostObject.h

@@ -51,6 +51,8 @@ public:
   jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propNameID);
   void set(jsi::Runtime &rt, const jsi::PropNameID &name,
            const jsi::Value &value);
+  void invalidate();
+  ~DBHostObject();
 
 private:
   void auto_register_update_hook();
@@ -68,6 +70,7 @@ private:
   jsi::Runtime &rt;
   std::vector<std::shared_ptr<ReactiveQuery>> reactive_queries;
   bool is_update_hook_registered = false;
+  bool invalidated = false;
 };
 
 } // namespace opsqlite

package/cpp/bindings.cpp

@@ -24,6 +24,7 @@ std::string _crsqlite_path;
 std::string _sqlite_vec_path;
 std::shared_ptr<react::CallInvoker> _invoker;
 std::shared_ptr<ThreadPool> thread_pool = std::make_shared<ThreadPool>();
+std::vector<std::shared_ptr<DBHostObject>> dbs;
 
 // React native will try to clean the module on JS context invalidation
 // (CodePush/Hot Reload) The clearState function is called and we use this flag
@@ -31,6 +32,9 @@ std::shared_ptr<ThreadPool> thread_pool = std::make_shared<ThreadPool>();
 bool invalidated = false;
 
 void clearState() {
+  for (const auto &db : dbs) {
+    db->invalidate();
+  }
   invalidated = true;
 
 #ifdef OP_SQLITE_USE_LIBSQL
@@ -88,6 +92,7 @@ void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker,
     std::shared_ptr<DBHostObject> db = std::make_shared<DBHostObject>(
         rt, path, invoker, thread_pool, name, path, _crsqlite_path,
         _sqlite_vec_path, encryptionKey);
+    dbs.emplace_back(db);
     return jsi::Object::createFromHostObject(rt, db);
   });
 

package/cpp/bridge.cpp

@@ -63,7 +63,7 @@ BridgeResult opsqlite_open(std::string const &name,
 
   if (dbMap.count(name) != 0) {
     throw std::runtime_error(
-        "[OP-SQLITE] Only JS connection per database is allowed, db name: " +
+        "[OP-SQLITE] Only one connection per database is allowed, db name: " +
         name);
   }
 #endif
@@ -742,9 +742,11 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
       opsqlite_bind_statement(statement, params);
     }
 
-    int i, count, column_type;
+    int i, column_type;
     std::string column_name, column_declared_type;
 
+    int column_count = sqlite3_column_count(statement);
+
     while (isConsuming) {
       step = sqlite3_step(statement);
 
@@ -755,25 +757,15 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
         }
 
         std::vector<JSVariant> row;
+        row.reserve(column_count);
 
         i = 0;
 
-        count = sqlite3_column_count(statement);
-
-        while (i < count) {
+        while (i < column_count) {
           column_type = sqlite3_column_type(statement, i);
 
           switch (column_type) {
-          case SQLITE_INTEGER: {
-            /**
-             * Warning this will loose precision because JS can
-             * only represent Integers up to 53 bits
-             */
-            double column_value = sqlite3_column_double(statement, i);
-            row.emplace_back(column_value);
-            break;
-          }
-
+          case SQLITE_INTEGER:
           case SQLITE_FLOAT: {
             double column_value = sqlite3_column_double(statement, i);
             row.emplace_back(column_value);
@@ -809,7 +801,7 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
           i++;
         }
 
-        results->push_back(row);
+          results->emplace_back(row);
 
         break;
       }
@@ -871,7 +863,7 @@ std::string operation_to_string(int operation_type) {
     return "UPDATE";
 
   default:
-    throw std::invalid_argument("Uknown SQLite operation on hook");
+    throw std::invalid_argument("Unknown SQLite operation on hook");
   }
 }
 

package/ios/OPSQLite.mm

@@ -12,10 +12,6 @@
 
 RCT_EXPORT_MODULE()
 
-- (void)setBridge:(RCTBridge *)bridge {
-  _bridge = bridge;
-}
-
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }
@@ -97,10 +93,8 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   return @true;
 }
 
-RCT_EXPORT_METHOD(moveAssetsDatabase
-                  : (NSDictionary *)args resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(moveAssetsDatabase : (NSDictionary *)args resolve : (
+    RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject) {
   NSString *documentPath = [NSSearchPathForDirectoriesInDomains(
       NSLibraryDirectory, NSUserDomainMask, true) objectAtIndex:0];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "9.1.1",
+  "version": "9.1.3",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",