Fix bind parameter handling

We had some functions using open-coded parameter conversion logic, which was broken.

Author: penberg

index.js

@@ -218,7 +218,7 @@ class Statement {
    * Executes the SQL statement and returns an info object.
    */
   run(...bindParameters) {
-    if (typeof bindParameters[0] === "object" && bindParameters[0] !== null) {
+    if (bindParameters.length == 1 && typeof bindParameters[0] === "object") {
       return statementRun.call(this.stmt, bindParameters[0]);
     } else {
       return statementRun.call(this.stmt, bindParameters.flat());
@@ -231,7 +231,7 @@ class Statement {
    * @param bindParameters - The bind parameters for executing the statement.
    */
   get(...bindParameters) {
-    if (typeof bindParameters[0] === "object" && bindParameters[0] !== null) {
+    if (bindParameters.length == 1 && typeof bindParameters[0] === "object") {
       return statementGet.call(this.stmt, bindParameters[0]);
     } else {
       return statementGet.call(this.stmt, bindParameters.flat());
@@ -244,7 +244,12 @@ class Statement {
    * @param bindParameters - The bind parameters for executing the statement.
    */
   iterate(...bindParameters) {
-    const rows = statementRowsSync.call(this.stmt, ...bindParameters);
+    var rows = undefined;
+    if (bindParameters.length == 1 && typeof bindParameters[0] === "object") {
+      rows = statementRowsSync.call(this.stmt, bindParameters[0]);
+    } else {
+      rows = statementRowsSync.call(this.stmt, bindParameters.flat());
+    }
     const iter = {
       next() {
         const row = rowsNext.call(rows);

integration-tests/tests/sync.test.js

@@ -94,6 +94,8 @@ test.serial("Statement.iterate() [empty]", async (t) => {
 
   const stmt = db.prepare("SELECT * FROM users WHERE id = 0");
   t.is(stmt.iterate().next().done, true);
+  t.is(stmt.iterate([]).next().done, true);
+  t.is(stmt.iterate({}).next().done, true);
 });
 
 test.serial("Statement.iterate()", async (t) => {

promise.js

@@ -219,7 +219,7 @@ class Statement {
    * Executes the SQL statement and returns an info object.
    */
   run(...bindParameters) {
-    if (typeof bindParameters[0] === "object" && bindParameters[0] !== null) {
+    if (bindParameters.length == 1 && typeof bindParameters[0] === "object") {
       return statementRun.call(this.stmt, bindParameters[0]);
     } else {
       return statementRun.call(this.stmt, bindParameters.flat());
@@ -232,7 +232,7 @@ class Statement {
    * @param bindParameters - The bind parameters for executing the statement.
    */
   get(...bindParameters) {
-    if (typeof bindParameters[0] === "object" && bindParameters[0] !== null) {
+    if (bindParameters.length == 1 && typeof bindParameters[0] === "object") {
       return statementGet.call(this.stmt, bindParameters[0]);
     } else {
       return statementGet.call(this.stmt, bindParameters.flat());
@@ -245,7 +245,12 @@ class Statement {
    * @param bindParameters - The bind parameters for executing the statement.
    */
   async iterate(...bindParameters) {
-    const rows = await statementRowsAsync.call(this.stmt, ...bindParameters);
+    var rows = undefined;
+    if (bindParameters.length == 1 && typeof bindParameters[0] === "object") {
+      rows = await statementRowsAsync.call(this.stmt, bindParameters[0]);
+    } else {
+      rows = await statementRowsAsync.call(this.stmt, bindParameters.flat());
+    }
     const iter = {
       next() {
         const row = rowsNext.call(rows);

src/lib.rs

@@ -286,13 +286,8 @@ impl Statement {
 
     fn js_rows_sync(mut cx: FunctionContext) -> JsResult<JsValue> {
         let stmt: Handle<'_, JsBox<Statement>> = cx.this()?;
-        let mut params = vec![];
-        for i in 0..cx.len() {
-            let v = cx.argument::<JsValue>(i)?;
-            let v = js_value_to_value(&mut cx, v)?;
-            params.push(v);
-        }
-        let params = libsql::Params::Positional(params);
+        let params = cx.argument::<JsValue>(0)?;
+        let params = convert_params(&mut cx, &stmt, params)?;
         stmt.stmt.reset();
         let fut = stmt.stmt.query(&params);
         let result = stmt.rt.block_on(fut);
@@ -307,13 +302,8 @@ impl Statement {
 
     fn js_rows_async(mut cx: FunctionContext) -> JsResult<JsPromise> {
         let stmt: Handle<'_, JsBox<Statement>> = cx.this()?;
-        let mut params = vec![];
-        for i in 0..cx.len() {
-            let v = cx.argument::<JsValue>(i)?;
-            let v = js_value_to_value(&mut cx, v)?;
-            params.push(v);
-        }
-        let params = libsql::Params::Positional(params);
+        let params = cx.argument::<JsValue>(0)?;
+        let params = convert_params(&mut cx, &stmt, params)?;
         stmt.stmt.reset();
         let (deferred, promise) = cx.promise();
         let channel = cx.channel();