@op-engineering/op-sqlite 6.0.1 → 6.0.2-beta3

package/cpp/bindings.h

@@ -1,11 +1,14 @@
+#pragma once
+
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
 #include <jsi/jsilib.h>
 
-using namespace facebook;
-
 namespace opsqlite {
 
+namespace jsi = facebook::jsi;
+namespace react = facebook::react;
+
 void install(jsi::Runtime &rt,
              std::shared_ptr<react::CallInvoker> jsCallInvoker,
              const char *docPath, const char *crsqlitePath);

package/cpp/bridge.cpp

@@ -397,13 +397,11 @@ opsqlite_execute(std::string const &dbName, std::string const &query,
 
     if (statementStatus != SQLITE_OK) {
       const char *message = sqlite3_errmsg(db);
-      return {
-          .type = SQLiteError,
-          .message = "[op-sqlite] SQL statement error on opsqlite_execute:\n" +
-                     std::to_string(statementStatus) + " description:\n" +
-                     std::string(message) +
-                     ". See error codes: https://www.sqlite.org/rescode.html",
-      };
+      return {.type = SQLiteError,
+              .message =
+                  "[op-sqlite] SQL statement error on opsqlite_execute:\n" +
+                  std::to_string(statementStatus) + " description:\n" +
+                  std::string(message)};
     }
 
     // The statement did not fail to parse but there is nothing to do, just
@@ -529,9 +527,7 @@ opsqlite_execute(std::string const &dbName, std::string const &query,
     return {.type = SQLiteError,
             .message =
                 "[op-sqlite] SQLite error code: " + std::to_string(result) +
-                ", description: " + std::string(errorMessage) +
-                ".\nSee SQLite error codes reference: "
-                "https://www.sqlite.org/rescode.html"};
+                ", description: " + std::string(errorMessage)};
   }
 
   int changedRowCount = sqlite3_changes(db);
@@ -575,8 +571,7 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
           .type = SQLiteError,
           .message = "[op-sqlite] SQL statement error:" +
                      std::to_string(statementStatus) +
-                     " description:" + std::string(message) +
-                     ". See error codes: https://www.sqlite.org/rescode.html",
+                     " description:" + std::string(message),
       };
     }
 
@@ -686,9 +681,7 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
     return {.type = SQLiteError,
             .message =
                 "[op-sqlite] SQLite error code: " + std::to_string(step) +
-                ", description: " + std::string(errorMessage) +
-                ".\nSee SQLite error codes reference: "
-                "https://www.sqlite.org/rescode.html"};
+                ", description: " + std::string(errorMessage)};
   }
 
   int changedRowCount = sqlite3_changes(db);
@@ -843,7 +836,8 @@ BridgeResult opsqlite_deregister_rollback_hook(std::string const &dbName) {
   return {SQLiteOk};
 }
 
-BridgeResult opsqlite_load_extension(std::string &db_name, std::string &path,
+BridgeResult opsqlite_load_extension(std::string const &db_name,
+                                     std::string &path,
                                      std::string &entry_point) {
 #ifdef OP_SQLITE_USE_PHONE_VERSION
   throw std::runtime_error(
@@ -873,4 +867,49 @@ BridgeResult opsqlite_load_extension(std::string &db_name, std::string &path,
 #endif
 }
 
+BatchResult opsqlite_execute_batch(std::string dbName,
+                                   std::vector<BatchArguments> *commands) {
+  size_t commandCount = commands->size();
+  if (commandCount <= 0) {
+    return BatchResult{
+        .type = SQLiteError,
+        .message = "No SQL commands provided",
+    };
+  }
+
+  try {
+    int affectedRows = 0;
+    opsqlite_execute(dbName, "BEGIN EXCLUSIVE TRANSACTION", nullptr, nullptr,
+                     nullptr);
+    for (int i = 0; i < commandCount; i++) {
+      auto command = commands->at(i);
+      // We do not provide a datastructure to receive query data because we
+      // don't need/want to handle this results in a batch execution
+      auto result = opsqlite_execute(dbName, command.sql, command.params.get(),
+                                     nullptr, nullptr);
+      if (result.type == SQLiteError) {
+        opsqlite_execute(dbName, "ROLLBACK", nullptr, nullptr, nullptr);
+        return BatchResult{
+            .type = SQLiteError,
+            .message = result.message,
+        };
+      } else {
+        affectedRows += result.affectedRows;
+      }
+    }
+    opsqlite_execute(dbName, "COMMIT", nullptr, nullptr, nullptr);
+    return BatchResult{
+        .type = SQLiteOk,
+        .affectedRows = affectedRows,
+        .commands = static_cast<int>(commandCount),
+    };
+  } catch (std::exception &exc) {
+    opsqlite_execute(dbName, "ROLLBACK", nullptr, nullptr, nullptr);
+    return BatchResult{
+        .type = SQLiteError,
+        .message = exc.what(),
+    };
+  }
+}
+
 } // namespace opsqlite

package/cpp/bridge.h

@@ -50,6 +50,9 @@ opsqlite_execute(std::string const &dbName, std::string const &query,
                  std::vector<DumbHostObject> *results,
                  std::shared_ptr<std::vector<SmartHostObject>> metadatas);
 
+BatchResult opsqlite_execute_batch(std::string dbName,
+                                   std::vector<BatchArguments> *commands);
+
 BridgeResult opsqlite_execute_raw(std::string const &dbName,
                                   std::string const &query,
                                   const std::vector<JSVariant> *params,
@@ -78,7 +81,8 @@ BridgeResult opsqlite_execute_prepared_statement(
     std::vector<DumbHostObject> *results,
     std::shared_ptr<std::vector<SmartHostObject>> metadatas);
 
-BridgeResult opsqlite_load_extension(std::string &db_name, std::string &path,
+BridgeResult opsqlite_load_extension(std::string const &db_name,
+                                     std::string &path,
                                      std::string &entry_point);
 
 } // namespace opsqlite