@op-engineering/op-sqlite 2.0.17 → 2.0.18

package/README.md

@@ -127,9 +127,9 @@ db.execute('PRAGMA journal_mode = MEMORY;'); // or OFF
 
 If you use [prepared statements](#prepared-statements) are useful to reduce the time of critical queries.
 
-# Perf flag
+# Perf flags
 
-You can turn on the performance flag to tweak all possible performance enhancing compilation flags, this greatly affects performance of sqlite itself:
+You can turn on the performance flag to tweak all possible performance enhancing compilation flags, this greatly affects performance of sqlite itself. Be aware this disables thread safety, you should only uses transactions (which operate based on a mutex in JS side) to avoid any issues.
 
 ```sh
 # For iOS install pods with the following env variable, you can also just an export like on Android
@@ -147,6 +147,14 @@ If correctly set you should see the following output in your console
 OP-SQLITE performance mode enabled! 🚀
 ```
 
+If you want to keep SQLite thread safety based on mutexes, you can use OP_SQLITE_PERF=2. This flag will enable the general compilation flags, except DSQLITE_THREADSAFE=0.
+If correctly set you should see the following output in your console
+
+```sh
+OP-SQLITE (thread safe) performance mode enabled! 🚀
+```
+
+Here you can read more about [SQLite Thread Safe](https://www.sqlite.org/threadsafe.html)
 # SQLite Gotchas
 
 ## Strictness
@@ -408,7 +416,7 @@ References: [Attach](https://www.sqlite.org/lang_attach.html) - [Detach](https:/
 ```ts
 db.attach('mainDatabase', 'statistics', 'stats', '../databases');
 
-const res = db.executeSql(
+const res = db.execute(
   'mainDatabase',
   'SELECT * FROM some_table_from_mainschema a INNER JOIN stats.some_table b on a.id_column = b.id_column'
 );

package/android/build.gradle

@@ -80,6 +80,10 @@ android {
               println "OP-SQLITE performance mode enabled! 🚀"
               cFlags "-DSQLITE_DQS=0", "-DSQLITE_THREADSAFE=0", "-DSQLITE_DEFAULT_MEMSTATUS=0", "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1", "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1", "-DSQLITE_MAX_EXPR_DEPTH=0", "-DSQLITE_OMIT_DEPRECATED=1", "-DSQLITE_OMIT_PROGRESS_CALLBACK=1", "-DSQLITE_OMIT_SHARED_CACHE=1", "-DSQLITE_USE_ALLOCA=1"
             }
+            if(System.getenv("OP_SQLITE_PERF") == '2') {
+              println "OP-SQLITE (thread safe) performance mode enabled! 🚀"
+              cFlags "-DSQLITE_DQS=0", "-DSQLITE_THREADSAFE=1", "-DSQLITE_DEFAULT_MEMSTATUS=0", "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1", "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1", "-DSQLITE_MAX_EXPR_DEPTH=0", "-DSQLITE_OMIT_DEPRECATED=1", "-DSQLITE_OMIT_PROGRESS_CALLBACK=1", "-DSQLITE_OMIT_SHARED_CACHE=1", "-DSQLITE_USE_ALLOCA=1"
+            }
             cppFlags "-O2", "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             arguments '-DANDROID_STL=c++_shared',

package/cpp/bindings.cpp

@@ -410,18 +410,20 @@ void install(jsi::Runtime &rt,
                    resolve, reject]() {
         try {
           auto batchResult = sqliteExecuteBatch(dbName, commands.get());
-          invoker->invokeAsync(
-              [&rt, batchResult = std::move(batchResult), resolve, reject] {
-                if (batchResult.type == SQLiteOk) {
-                  auto res = jsi::Object(rt);
-                  res.setProperty(rt, "rowsAffected",
-                                  jsi::Value(batchResult.affectedRows));
-                  resolve->asObject(rt).asFunction(rt).call(rt, std::move(res));
-                } else {
-                  // TODO replace with reject
-                  throw jsi::JSError(rt, batchResult.message);
-                }
-              });
+          invoker->invokeAsync([&rt, batchResult = std::move(batchResult),
+                                resolve, reject] {
+            if (batchResult.type == SQLiteOk) {
+              auto res = jsi::Object(rt);
+              res.setProperty(rt, "rowsAffected",
+                              jsi::Value(batchResult.affectedRows));
+              resolve->asObject(rt).asFunction(rt).call(rt, std::move(res));
+            } else {
+              auto errorCtr = rt.global().getPropertyAsFunction(rt, "Error");
+              auto error = errorCtr.callAsConstructor(
+                  rt, jsi::String::createFromUtf8(rt, batchResult.message));
+              reject->asObject(rt).asFunction(rt).call(rt, error);
+            }
+          });
         } catch (std::exception &exc) {
           invoker->invokeAsync(
               [&rt, reject, &exc] { throw jsi::JSError(rt, exc.what()); });
@@ -438,7 +440,7 @@ void install(jsi::Runtime &rt,
   auto load_file = HOSTFN("loadFile", 2) {
     if (sizeof(args) < 2) {
       throw std::runtime_error(
-          "[op-sqlite][loadFileAsync] Incorrect parameter count");
+          "[op-sqlite][loadFile] Incorrect parameter count");
       return {};
     }
 
@@ -454,18 +456,21 @@ void install(jsi::Runtime &rt,
         try {
           const auto importResult = importSQLFile(dbName, sqlFileName);
 
-          invoker->invokeAsync(
-              [&rt, result = std::move(importResult), resolve, reject] {
-                if (result.type == SQLiteOk) {
-                  auto res = jsi::Object(rt);
-                  res.setProperty(rt, "rowsAffected",
-                                  jsi::Value(result.affectedRows));
-                  res.setProperty(rt, "commands", jsi::Value(result.commands));
-                  resolve->asObject(rt).asFunction(rt).call(rt, std::move(res));
-                } else {
-                  throw jsi::JSError(rt, result.message);
-                }
-              });
+          invoker->invokeAsync([&rt, result = std::move(importResult), resolve,
+                                reject] {
+            if (result.type == SQLiteOk) {
+              auto res = jsi::Object(rt);
+              res.setProperty(rt, "rowsAffected",
+                              jsi::Value(result.affectedRows));
+              res.setProperty(rt, "commands", jsi::Value(result.commands));
+              resolve->asObject(rt).asFunction(rt).call(rt, std::move(res));
+            } else {
+              auto errorCtr = rt.global().getPropertyAsFunction(rt, "Error");
+              auto error = errorCtr.callAsConstructor(
+                  rt, jsi::String::createFromUtf8(rt, result.message));
+              reject->asObject(rt).asFunction(rt).call(rt, error);
+            }
+          });
         } catch (std::exception &exc) {
           invoker->invokeAsync(
               [&rt, err = exc.what(), reject] { throw jsi::JSError(rt, err); });

package/cpp/bridge.cpp

@@ -257,7 +257,7 @@ BridgeResult opsqlite_execute_prepared_statement(
           // Intentionally left blank
 
         default:
-          row.values.push_back(JSVariant(NULL));
+          row.values.push_back(JSVariant(nullptr));
           break;
         }
         i++;
@@ -445,7 +445,7 @@ opsqlite_execute(std::string const &dbName, std::string const &query,
             // Intentionally left blank
 
           default:
-            row.values.push_back(JSVariant(NULL));
+            row.values.push_back(JSVariant(nullptr));
             break;
           }
           i++;
@@ -617,7 +617,7 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
             // Intentionally left blank
 
           default:
-            row.push_back(JSVariant(NULL));
+            row.push_back(JSVariant(nullptr));
             break;
           }
           i++;

package/op-sqlite.podspec

@@ -28,6 +28,8 @@ Pod::Spec.new do |s|
 
   other_cflags = '-DSQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION=1'
 
+  optimizedCflags = other_cflags + '$(inherited) -DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED=1 -DSQLITE_OMIT_PROGRESS_CALLBACK=1 -DSQLITE_OMIT_SHARED_CACHE=1 -DSQLITE_USE_ALLOCA=1'
+
   xcconfig = {
     :GCC_PREPROCESSOR_DEFINITIONS => "HAVE_FULLFSYNC=1",
     :WARNING_CFLAGS => "-Wno-shorten-64-to-32 -Wno-comma -Wno-unreachable-code -Wno-conditional-uninitialized -Wno-deprecated-declarations",
@@ -43,7 +45,12 @@ Pod::Spec.new do |s|
 
   if ENV['OP_SQLITE_PERF'] == '1' then
     puts "OP-SQLITE performance mode enabled! 🚀\n"
-    xcconfig[:OTHER_CFLAGS] = other_cflags + '$(inherited) -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED=1 -DSQLITE_OMIT_PROGRESS_CALLBACK=1 -DSQLITE_OMIT_SHARED_CACHE=1 -DSQLITE_USE_ALLOCA=1'
+    xcconfig[:OTHER_CFLAGS] = optimizedCflags + ' -DSQLITE_THREADSAFE=0 '
+  end
+
+  if ENV['OP_SQLITE_PERF'] == '2' then
+    puts "OP-SQLITE (thread safe) performance mode enabled! 🚀\n"
+    xcconfig[:OTHER_CFLAGS] = optimizedCflags + ' -DSQLITE_THREADSAFE=1 '
   end
 
   s.pod_target_xcconfig = xcconfig

package/package.json

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