Merge branch 'main' into oscar/android-16kb-pages

# Conflicts:
#	example/ios/Podfile.lock

Author: ospfranco

cpp/PreparedStatementHostObject.cpp

@@ -74,6 +74,29 @@ jsi::Value PreparedStatementHostObject::get(jsi::Runtime &rt,
         });
     }
 
+    if (name == "bindSync") {
+      return HOSTFN("bindSync") {
+        if (_stmt == nullptr) {
+          throw std::runtime_error("statement has been freed");
+        }
+        
+        const jsi::Value &js_params = args[0];
+        std::vector<JSVariant> params = to_variant_vec(rt, js_params);
+        try {
+#ifdef OP_SQLITE_USE_LIBSQL
+          opsqlite_libsql_bind_statement(_stmt, &params);
+#else
+          opsqlite_bind_statement(_stmt, &params);
+#endif
+        } catch (const std::runtime_error &e) {
+          throw std::runtime_error(e.what());
+        } catch (const std::exception &e) {
+          throw std::runtime_error(e.what());
+        }
+        return {};
+      });
+    }
+
     if (name == "execute") {
         return HOSTFN("execute") {
             if (_stmt == nullptr) {

docs/docs/api.md

@@ -70,6 +70,8 @@ const statement = db.prepareStatement('SELECT * FROM User WHERE name = ?;');
 
 // bind the variables in the order they appear
 await statement.bind(['Oscar']);
+// Or use the bindsync version
+statement.bindSync(['Luis']);
 let results1 = await statement.execute();
 
 await statement.bind(['Carlos']);

example/package.json

@@ -63,7 +63,7 @@
     "node": ">=18"
   },
   "op-sqlite": {
-    "libsql": true,
+    "libsql": false,
     "sqlcipher": false,
     "iosSqlite": false,
     "fts5": true,

example/src/tests/preparedStatements.spec.ts

@@ -82,5 +82,21 @@ export function preparedStatementsTests() {
       await statement.bind([5, 'Pedro']);
       await statement.execute();
     });
+
+    it('prepared statement, bindsync', async () => {
+      const statement = db.prepareStatement(
+        'INSERT INTO "User" (id, name) VALUES(?,?);',
+      );
+
+      statement.bindSync([4, 'Juan']);
+      await statement.execute();
+
+      statement.bind([5, 'Pedro']);
+      await statement.execute();
+
+      const selectStatement = db.prepareStatement('SELECT * FROM User;');
+      let results = await selectStatement.execute();
+      expect(results.rows.length).to.equal(5);
+    });
   });
 }

src/index.ts

@@ -97,6 +97,7 @@ type PendingTransaction = {
 
 export type PreparedStatement = {
   bind: (params: any[]) => Promise<void>;
+  bindSync: (params: any[]) => void;
   execute: () => Promise<QueryResult>;
 };
 
@@ -517,16 +518,15 @@ function enhanceDB(db: InternalDB, options: DBParams): DB {
       const stmt = db.prepareStatement(query);
 
       return {
-        bind: async (params: Scalar[]) => {
-          const sanitizedParams = params.map((p) => {
-            if (ArrayBuffer.isView(p)) {
-              return p.buffer;
-            }
+        bindSync: (params: Scalar[]) => {
+          const sanitizedParams = sanitizeArrayBuffersInArray(params);
 
-            return p;
-          });
+          stmt.bindSync(sanitizedParams!);
+        },
+        bind: async (params: Scalar[]) => {
+          const sanitizedParams = sanitizeArrayBuffersInArray(params);
 
-          await stmt.bind(sanitizedParams);
+          await stmt.bind(sanitizedParams!);
         },
         execute: stmt.execute,
       };