@op-engineering/op-sqlite 5.0.1 → 5.0.6

package/README.md

@@ -1,11 +1,5 @@
 ![benchmark](benchmark.png)
 
-```sh
-yarn add @op-engineering/op-sqlite && npx pod-install
-```
-
-OP-SQLite embeds the latest version of SQLite and provides a low-level API to execute SQL queries.
-
 **Current SQLite version: 3.45.1**
 
 Created by [@ospfranco](https://twitter.com/ospfranco). **Please consider sponsoring!**.
@@ -14,10 +8,6 @@ Created by [@ospfranco](https://twitter.com/ospfranco). **Please consider sponso
 
 [See the docs](https://ospfranco.notion.site/OP-SQLite-Documentation-a279a52102464d0cb13c3fa230d2f2dc?pvs=4)
 
-# Contribute
-
-You need to have clang-format installed (`brew install clang-format`)
-
 # License
 
 MIT License.

package/android/CMakeLists.txt

@@ -39,7 +39,7 @@ add_library(
   cpp-adapter.cpp
 )
 
-if (OP_SQLITE_USE_SQLCIPHER)
+if (USE_SQLCIPHER)
   target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlcipher/sqlite3.h ../cpp/sqlcipher/sqlite3.c)
 
   add_definitions(
@@ -53,7 +53,7 @@ else()
  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.h ../cpp/sqlite3.c)
 endif()
 
-if (OP_SQLITE_USE_CRSQLITE)
+if (USE_CRSQLITE)
   add_definitions(
     -DOP_SQLITE_USE_CRSQLITE=1
   )
@@ -70,16 +70,25 @@ find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)
 find_library(LOG_LIB log)
 
-target_link_libraries(
-  ${PACKAGE_NAME}
-  ${LOG_LIB}
-  fbjni::fbjni
-  ReactAndroid::jsi
-  ReactAndroid::turbomodulejsijni
-  ReactAndroid::react_nativemodule_core
-  android
-)
-
-if (OP_SQLITE_USE_SQLCIPHER)
-  target_link_libraries(${PACKAGE_NAME} PRIVATE openssl::crypto)
+if (USE_SQLCIPHER)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ${LOG_LIB}
+    fbjni::fbjni
+    ReactAndroid::jsi
+    ReactAndroid::turbomodulejsijni
+    ReactAndroid::react_nativemodule_core
+    android
+    openssl::crypto
+  )
+else()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ${LOG_LIB}
+    fbjni::fbjni
+    ReactAndroid::jsi
+    ReactAndroid::turbomodulejsijni
+    ReactAndroid::react_nativemodule_core
+    android
+  )
 endif()

package/android/build.gradle

@@ -31,6 +31,7 @@ def useSQLCipher = false
 def useCRSQLite = false
 def performanceMode = "0"
 def sqliteFlags = ""
+def enableFTS5 = false
 
 def packageJsonFile = new File("$rootDir/../package.json")
 def packageJson = new JsonSlurper().parseText(packageJsonFile.text)
@@ -41,6 +42,7 @@ if(opsqliteConfig) {
   useCRSQLite = opsqliteConfig["crsqlite"]
   performanceMode = opsqliteConfig["performanceMode"] ? opsqliteConfig["performanceMode"] : ""
   sqliteFlags = opsqliteConfig["sqliteFlags"] ? opsqliteConfig["sqliteFlags"] : ""
+  enableFTS5 = opsqliteConfig["fts5"]
 }
 
 if(useSQLCipher) {
@@ -61,6 +63,10 @@ if(performanceMode == "2") {
   println "[OP-SQLITE] Thread safe performance mode enabled! 🚀"
 }
 
+if(enableFTS5) {
+  println "[OP-SQLITE] FTS5 enabled! 🔎"
+}
+
 if (isNewArchitectureEnabled()) {
     apply plugin: "com.facebook.react"
 }
@@ -100,26 +106,37 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 21
+    minSdkVersion 23
     targetSdkVersion safeExtGet('targetSdkVersion', 34)
     versionCode 1
     versionName "1.0"
     
     externalNativeBuild {
         cmake {
+            if(useSQLCipher) {
+              cFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
+              cppFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
+            }
+            if(useCRSQLite) {
+              cFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
+              cppFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
+            }
             if(performanceMode == '1') {
               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(performanceMode == '2') {
               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"]
             }
+            if(enableFTS5) {
+              cFlags += ["-DSQLITE_ENABLE_FTS4=1", "-DSQLITE_ENABLE_FTS3_PARENTHESIS=1", "-DSQLITE_ENABLE_FTS5=1"]
+            }
 
             cppFlags "-O2", "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             arguments "-DANDROID_STL=c++_shared",
-              "-DSQLITE_FLAGS='$sqliteFlags'"
-              "-DOP_SQLITE_USE_SQLCIPHER='${useSQLCipher? 1 : 0}'"
-              "-DOP_SQLITE_USE_CRSQLITE='${useCRSQLite? 1 : 0}'"
+              "-DSQLITE_FLAGS='$sqliteFlags'",
+              "-DUSE_SQLCIPHER=${useSQLCipher ? 1 : 0}",
+              "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}"
             abiFilters (*reactNativeArchitectures())
         }
     }
@@ -170,7 +187,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation 'com.facebook.react:react-native'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  if (System.getenv("OP_SQLITE_USE_SQLCIPHER") == '1') {
+  if (useSQLCipher) {
     implementation('com.android.ndk.thirdparty:openssl:1.1.1q-beta-1')
   }
 }

package/cpp/DumbHostObject.h

@@ -15,7 +15,7 @@ namespace jsi = facebook::jsi;
 
 class JSI_EXPORT DumbHostObject : public jsi::HostObject {
 public:
-  DumbHostObject(){};
+  DumbHostObject() {};
 
   DumbHostObject(std::shared_ptr<std::vector<SmartHostObject>> metadata);
 

package/cpp/PreparedStatementHostObject.cpp

@@ -42,6 +42,7 @@ jsi::Value PreparedStatementHostObject::get(jsi::Runtime &rt,
       if (_statement == nullptr) {
         throw std::runtime_error("statement has been freed");
       }
+
       std::vector<DumbHostObject> results;
       std::shared_ptr<std::vector<SmartHostObject>> metadata =
           std::make_shared<std::vector<SmartHostObject>>();

package/cpp/SmartHostObject.h

@@ -12,7 +12,7 @@ namespace jsi = facebook::jsi;
 
 class JSI_EXPORT SmartHostObject : public jsi::HostObject {
 public:
-  SmartHostObject(){};
+  SmartHostObject() {};
 
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt);
 

package/cpp/bindings.cpp

@@ -199,7 +199,7 @@ void install(jsi::Runtime &rt,
 
     std::string dbName = args[0].asString(rt).utf8(rt);
 
-    std::string tempDocPath = std::string(basePath);
+    std::string path = std::string(basePath);
 
     if (count > 1 && !args[1].isUndefined() && !args[1].isNull()) {
       if (!args[1].isString()) {
@@ -207,10 +207,20 @@ void install(jsi::Runtime &rt,
             "[op-sqlite][open] database location must be a string");
       }
 
-      tempDocPath = tempDocPath + "/" + args[1].asString(rt).utf8(rt);
+      std::string location = args[1].asString(rt).utf8(rt);
+
+      if (!location.empty()) {
+        if (location == ":memory:") {
+          path = ":memory:";
+        } else if (location.rfind("/", 0) == 0) {
+          path = location;
+        } else {
+          path = path + "/" + location;
+        }
+      }
     }
 
-    BridgeResult result = opsqlite_remove(dbName, tempDocPath);
+    BridgeResult result = opsqlite_remove(dbName, path);
 
     if (result.type == SQLiteError) {
       throw std::runtime_error(result.message);
@@ -663,6 +673,14 @@ void install(jsi::Runtime &rt,
     return jsi::String::createFromUtf8(rt, result);
   });
 
+  auto is_sqlcipher = HOSTFN("isSQLCipher", 0) {
+#ifdef OP_SQLITE_USE_SQLCIPHER
+    return true;
+#else
+    return false;
+#endif
+  });
+
   jsi::Object module = jsi::Object(rt);
 
   module.setProperty(rt, "open", std::move(open));
@@ -682,6 +700,7 @@ void install(jsi::Runtime &rt,
   module.setProperty(rt, "loadExtension", std::move(load_extension));
   module.setProperty(rt, "executeRawAsync", std::move(execute_raw_async));
   module.setProperty(rt, "getDbPath", std::move(get_db_path));
+  module.setProperty(rt, "isSQLCipher", std::move(is_sqlcipher));
 
   rt.global().setProperty(rt, "__OPSQLiteProxy", std::move(module));
 }

package/cpp/bridge.cpp

@@ -204,7 +204,7 @@ inline void opsqlite_bind_statement(sqlite3_stmt *statement,
     } else if (std::holds_alternative<ArrayBuffer>(value)) {
       ArrayBuffer buffer = std::get<ArrayBuffer>(value);
       sqlite3_bind_blob(statement, sqIndex, buffer.data.get(), buffer.size,
-                        SQLITE_STATIC);
+                        SQLITE_TRANSIENT);
     } else {
       sqlite3_bind_null(statement, sqIndex);
     }