@op-engineering/op-sqlite 11.4.9 → 12.0.1

package/cpp/DBHostObject.cpp

@@ -188,54 +188,43 @@ DBHostObject::DBHostObject(jsi::Runtime &rt, std::string &base_path,
 
 void DBHostObject::create_jsi_functions() {
     function_map["attach"] = HOSTFN("attach") {
-        if (count < 3) {
-            throw std::runtime_error(
-                "[op-sqlite][attach] Incorrect number of arguments");
-        }
-        if (!args[0].isString() || !args[1].isString() || !args[2].isString()) {
-            throw std::runtime_error("[op-sqlite] name, database to attach and "
-                                     "alias must be strings");
-        }
-
         std::string secondary_db_path = std::string(base_path);
-        if (count > 3) {
-            if (!args[3].isString()) {
-                throw std::runtime_error(
-                    "[op-sqlite][attach] database location must be a string");
-            }
 
-            secondary_db_path += "/" + args[3].asString(rt).utf8(rt);
+        auto obj_params = args[0].asObject(rt);
+
+        std::string secondary_db_name =
+            obj_params.getProperty(rt, "secondaryDbFileName")
+                .asString(rt)
+                .utf8(rt);
+        std::string alias =
+            obj_params.getProperty(rt, "alias").asString(rt).utf8(rt);
+
+        if (obj_params.hasProperty(rt, "location")) {
+            std::string location =
+                obj_params.getProperty(rt, "location").asString(rt).utf8(rt);
+            secondary_db_path = secondary_db_path + location;
         }
 
-        std::string main_db_name = args[0].asString(rt).utf8(rt);
-        std::string secondary_db_name = args[1].asString(rt).utf8(rt);
-        std::string alias = args[2].asString(rt).utf8(rt);
 #ifdef OP_SQLITE_USE_LIBSQL
         opsqlite_libsql_attach(db, secondary_db_path, secondary_db_name, alias);
 #else
-        opsqlite_attach(db, main_db_name, secondary_db_path, secondary_db_name,
-                        alias);
+        opsqlite_attach(db, secondary_db_path, secondary_db_name, alias);
 #endif
 
         return {};
     });
 
     function_map["detach"] = HOSTFN("detach") {
-        if (count < 2) {
-            throw std::runtime_error(
-                "[op-sqlite][detach] Incorrect number of arguments");
-        }
-        if (!args[0].isString() || !args[1].isString()) {
-            throw std::runtime_error(
-                "[op-sqlite] database name and alias must be a strings");
+
+        if (!args[0].isString()) {
+            throw std::runtime_error("[op-sqlite] alias must be a strings");
         }
 
-        std::string dbName = args[0].asString(rt).utf8(rt);
-        std::string alias = args[1].asString(rt).utf8(rt);
+        std::string alias = args[0].asString(rt).utf8(rt);
 #ifdef OP_SQLITE_USE_LIBSQL
         opsqlite_libsql_detach(db, alias);
 #else
-        opsqlite_detach(db, dbName, alias);
+        opsqlite_detach(db, alias);
 #endif
 
         return {};

package/cpp/bridge.cpp

@@ -150,8 +150,7 @@ void opsqlite_close(sqlite3 *db) {
     sqlite3_close_v2(db);
 }
 
-void opsqlite_attach(sqlite3 *db, std::string const &main_db_name,
-                     std::string const &doc_path,
+void opsqlite_attach(sqlite3 *db, std::string const &doc_path,
                      std::string const &secondary_db_name,
                      std::string const &alias) {
     auto secondary_db_path = opsqlite_get_db_path(secondary_db_name, doc_path);
@@ -160,8 +159,7 @@ void opsqlite_attach(sqlite3 *db, std::string const &main_db_name,
     opsqlite_execute(db, statement, nullptr);
 }
 
-void opsqlite_detach(sqlite3 *db, std::string const &main_db_name,
-                     std::string const &alias) {
+void opsqlite_detach(sqlite3 *db, std::string const &alias) {
     std::string statement = "DETACH DATABASE " + alias;
     opsqlite_execute(db, statement, nullptr);
 }

package/cpp/bridge.h

@@ -37,13 +37,11 @@ void opsqlite_close(sqlite3 *db);
 void opsqlite_remove(sqlite3 *db, std::string const &name,
                      std::string const &doc_path);
 
-void opsqlite_attach(sqlite3 *db, std::string const &main_db_name,
-                     std::string const &doc_path,
+void opsqlite_attach(sqlite3 *db, std::string const &doc_path,
                      std::string const &secondary_db_name,
                      std::string const &alias);
 
-void opsqlite_detach(sqlite3 *db, std::string const &main_db_name,
-                     std::string const &alias);
+void opsqlite_detach(sqlite3 *db, std::string const &alias);
 
 BridgeResult opsqlite_execute(sqlite3 *db, std::string const &query,
                               const std::vector<JSVariant> *params);