@op-engineering/op-sqlite 6.0.2-beta1 → 6.0.2-beta4

package/android/CMakeLists.txt

@@ -9,6 +9,7 @@ set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
  include_directories(
    ../cpp
    ../cpp/sqlcipher
+   ../cpp/libsql
  )
 
 add_definitions(
@@ -18,29 +19,18 @@ add_definitions(
 add_library(
   ${PACKAGE_NAME}
   SHARED
-  ../cpp/bridge.cpp
-  ../cpp/bridge.h
   ../cpp/bindings.cpp
-  ../cpp/bindings.h
-  ../cpp/utils.h
   ../cpp/utils.cpp
-  ../cpp/ThreadPool.h
   ../cpp/ThreadPool.cpp
-  ../cpp/sqlbatchexecutor.h
-  ../cpp/sqlbatchexecutor.cpp
   ../cpp/SmartHostObject.cpp
-  ../cpp/SmartHostObject.h
-  ../cpp/PreparedStatementHostObject.h
   ../cpp/PreparedStatementHostObject.cpp
   ../cpp/DumbHostObject.cpp
-  ../cpp/DumbHostObject.h
-  ../cpp/macros.h
-  ../cpp/types.h
+  ../cpp/DBHostObject.cpp
   cpp-adapter.cpp
 )
 
 if (USE_SQLCIPHER)
-  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlcipher/sqlite3.h ../cpp/sqlcipher/sqlite3.c)
+  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlcipher/sqlite3.h ../cpp/sqlcipher/sqlite3.c ../cpp/bridge.cpp ../cpp/bridge.h)
 
   add_definitions(
     -DOP_SQLITE_USE_SQLCIPHER=1
@@ -49,8 +39,14 @@ if (USE_SQLCIPHER)
   )
   
   find_package(openssl REQUIRED CONFIG)
+elseif (USE_LIBSQL)
+  target_sources(${PACKAGE_NAME} PRIVATE ../cpp/libsql/bridge.cpp)
+  
+  add_definitions(
+    -DOP_SQLITE_USE_LIBSQL=1
+  )
 else()
- target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.h ../cpp/sqlite3.c)
+ target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.h ../cpp/sqlite3.c ../cpp/bridge.cpp ../cpp/bridge.h)
 endif()
 
 if (USE_CRSQLITE)
@@ -81,7 +77,22 @@ if (USE_SQLCIPHER)
     android
     openssl::crypto
   )
-else()
+elseif (USE_LIBSQL)
+  cmake_path(SET LIBSQL ${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libsql_experimental.a NORMALIZE)
+  add_library(libsql STATIC IMPORTED)
+  set_target_properties(libsql PROPERTIES IMPORTED_LOCATION ${LIBSQL})
+
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ${LOG_LIB}
+    fbjni::fbjni
+    ReactAndroid::jsi
+    ReactAndroid::turbomodulejsijni
+    ReactAndroid::react_nativemodule_core
+    android
+    libsql
+  )
+else ()
   target_link_libraries(
     ${PACKAGE_NAME}
     ${LOG_LIB}

package/android/build.gradle

@@ -28,6 +28,7 @@ def isNewArchitectureEnabled() {
 }
 
 def useSQLCipher = false
+def useLibsql = false
 def useCRSQLite = false
 def performanceMode = "0"
 def sqliteFlags = ""
@@ -43,10 +44,13 @@ if(opsqliteConfig) {
   performanceMode = opsqliteConfig["performanceMode"] ? opsqliteConfig["performanceMode"] : ""
   sqliteFlags = opsqliteConfig["sqliteFlags"] ? opsqliteConfig["sqliteFlags"] : ""
   enableFTS5 = opsqliteConfig["fts5"]
+  useLibsql = opsqliteConfig["libsql"]
 }
 
 if(useSQLCipher) {
   println "[OP-SQLITE] using SQLCipher 🔒"
+} else if(useLibsql) {
+  println "[OP-SQLITE] using libsql 📦"
 } else {
   println "[OP-SQLITE] using Vanilla SQLite"
 }
@@ -117,6 +121,10 @@ android {
               cFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
               cppFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
             }
+            if(useLibsql) {
+              cFlags += "-DOP_SQLITE_USE_LIBSQL=1"
+              cppFlags += "-DOP_SQLITE_USE_LIBSQL=1"
+            }
             if(useCRSQLite) {
               cFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
               cppFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
@@ -136,7 +144,8 @@ android {
             arguments "-DANDROID_STL=c++_shared",
               "-DSQLITE_FLAGS='$sqliteFlags'",
               "-DUSE_SQLCIPHER=${useSQLCipher ? 1 : 0}",
-              "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}"
+              "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}",
+              "-DUSE_LIBSQL=${useLibsql ? 1 : 0}"
             abiFilters (*reactNativeArchitectures())
         }
     }

package/android/cpp-adapter.cpp

@@ -6,6 +6,10 @@
 #include <jsi/jsi.h>
 #include <typeinfo>
 
+namespace jsi = facebook::jsi;
+namespace react = facebook::react;
+namespace jni = facebook::jni;
+
 // This file is not using raw jni but rather fbjni, do not change how the native
 // functions are registered
 // https://github.com/facebookincubator/fbjni/blob/main/docs/quickref.md