@op-engineering/op-sqlite 7.0.1 → 7.0.5

package/cpp/DBHostObject.cpp

@@ -179,7 +179,7 @@ DBHostObject::DBHostObject(jsi::Runtime &rt, std::string &base_path,
   BridgeResult result =
       opsqlite_open(db_name, path, crsqlite_path, encryption_key);
 #elif OP_SQLITE_USE_LIBSQL
-  BridgeResult result = opsqlite_libsql_open(db_name, path);
+  BridgeResult result = opsqlite_libsql_open(db_name, path, crsqlite_path);
 #else
   BridgeResult result = opsqlite_open(db_name, path, crsqlite_path);
 #endif

package/cpp/libsql/bridge.cpp

@@ -80,7 +80,8 @@ BridgeResult opsqlite_libsql_open_sync(std::string const &name,
 }
 
 BridgeResult opsqlite_libsql_open(std::string const &name,
-                                  std::string const &last_path) {
+                                  std::string const &last_path,
+                                  std::string const &crsqlitePath) {
   std::string path = opsqlite_get_db_path(name, last_path);
 
   int status = 0;
@@ -100,6 +101,19 @@ BridgeResult opsqlite_libsql_open(std::string const &name,
     return {.type = SQLiteError, .message = err};
   }
 
+#ifdef OP_SQLITE_USE_CRSQLITE
+  const char *errMsg;
+  const char *crsqliteEntryPoint = "sqlite3_crsqlite_init";
+
+  status = libsql_load_extension(c, crsqlitePath.c_str(), crsqliteEntryPoint, &errMsg);
+
+  if (status != 0) {
+    return {.type = SQLiteError, .message = errMsg};
+  } else {
+    LOGI("Loaded CRSQlite successfully");
+  }
+#endif
+
   db_map[name] = {.db = db, .c = c};
 
   return {.type = SQLiteOk, .affectedRows = 0};

package/cpp/libsql/bridge.h

@@ -28,7 +28,8 @@ std::string opsqlite_get_db_path(std::string const &name,
                                  std::string const &location);
 
 BridgeResult opsqlite_libsql_open(std::string const &name,
-                                  std::string const &path);
+                                  std::string const &path,
+                                  std::string const &crsqlitePath);
 
 BridgeResult opsqlite_libsql_open_remote(std::string const &url,
                                          std::string const &auth_token);

package/cpp/libsql/libsql.h

@@ -91,6 +91,11 @@ void libsql_close(libsql_database_t db);
 
 int libsql_connect(libsql_database_t db, libsql_connection_t *out_conn, const char **out_err_msg);
 
+int libsql_load_extension(libsql_connection_t conn,
+                          const char *path,
+                          const char *entry_point,
+                          const char **out_err_msg);
+
 int libsql_reset(libsql_connection_t conn, const char **out_err_msg);
 
 void libsql_disconnect(libsql_connection_t conn);

package/ios/libsql.xcframework/ios-arm64/Headers/libsql.h

@@ -91,6 +91,11 @@ void libsql_close(libsql_database_t db);
 
 int libsql_connect(libsql_database_t db, libsql_connection_t *out_conn, const char **out_err_msg);
 
+int libsql_load_extension(libsql_connection_t conn,
+                          const char *path,
+                          const char *entry_point,
+                          const char **out_err_msg);
+
 int libsql_reset(libsql_connection_t conn, const char **out_err_msg);
 
 void libsql_disconnect(libsql_connection_t conn);

package/ios/libsql.xcframework/ios-arm64_x86_64-simulator/Headers/libsql.h

@@ -91,6 +91,11 @@ void libsql_close(libsql_database_t db);
 
 int libsql_connect(libsql_database_t db, libsql_connection_t *out_conn, const char **out_err_msg);
 
+int libsql_load_extension(libsql_connection_t conn,
+                          const char *path,
+                          const char *entry_point,
+                          const char **out_err_msg);
+
 int libsql_reset(libsql_connection_t conn, const char **out_err_msg);
 
 void libsql_disconnect(libsql_connection_t conn);

package/op-sqlite.podspec

@@ -130,15 +130,15 @@ Pod::Spec.new do |s|
   end
 
   if use_libsql then
-    if use_crsqlite then
-      raise "Cannot use CRSQLite and libsql at the same time"
-    end
-
     if use_sqlcipher then
       raise "Cannot use SQLCipher and libsql at the same time"
     end
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_LIBSQL=1"
-    s.vendored_frameworks = "ios/libsql.xcframework"
+    if use_crsqlite then
+      s.vendored_frameworks = "ios/libsql.xcframework", "ios/crsqlite.xcframework"
+    else
+      s.vendored_frameworks = "ios/libsql.xcframework"
+    end
   end
 
   if sqlite_flags != "" then

package/package.json

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