Merge pull request #124 from tursodatabase/fix-statement-run

Fix Statement.run() for SELECT statements

Author: penberg

Cargo.lock

@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-libsql = { git = "https://github.com/tursodatabase/libsql/", rev = "8521f874f67365fc07f0469681f3351d65f3c761", features = ["encryption"] }
+libsql = { git = "https://github.com/tursodatabase/libsql/", rev = "dd548a902b56cc5b9daa3cec7a43ca887ea81136", features = ["encryption"] }
 tracing = "0.1"
 once_cell = "1.18.0"
 tokio = { version = "1.29.1", features = [ "rt-multi-thread" ] }

Cargo.toml

@@ -41,6 +41,14 @@ test.serial("Statement.prepare() error", async (t) => {
   });
 });
 
+test.serial("Statement.run() returning rows", async (t) => {
+  const db = t.context.db;
+
+  const stmt = db.prepare("SELECT 1");
+  const info = stmt.run();
+  t.is(info.changes, 0);
+});
+
 test.serial("Statement.run() [positional]", async (t) => {
   const db = t.context.db;
 

integration-tests/tests/sync.test.js

@@ -76,16 +76,27 @@ impl Statement {
 
     pub fn js_run(mut cx: FunctionContext) -> JsResult<JsValue> {
         let stmt: Handle<'_, JsBox<Statement>> = cx.this()?;
+        let raw_conn = stmt.conn.clone();
+        let total_changes_before = raw_conn.blocking_lock().total_changes();
         let params = cx.argument::<JsValue>(0)?;
         let params = convert_params(&mut cx, &stmt, params)?;
         let mut raw_stmt = stmt.stmt.blocking_lock();
         raw_stmt.reset();
-        let fut = raw_stmt.execute(params);
+        let fut = raw_stmt.run(params);
         let rt = runtime(&mut cx)?;
-        let result = rt.block_on(fut);
-        let changes = result.or_else(|err| throw_libsql_error(&mut cx, err))?;
-        let raw_conn = stmt.conn.clone();
-        let last_insert_rowid = raw_conn.blocking_lock().last_insert_rowid();
+        rt.block_on(fut)
+            .or_else(|err| throw_libsql_error(&mut cx, err))?;
+        let (changes, last_insert_rowid) = {
+            let raw_conn = stmt.conn.clone();
+            let raw_conn = raw_conn.blocking_lock();
+            let changes = if raw_conn.total_changes() == total_changes_before {
+                0
+            } else {
+                raw_conn.changes()
+            };
+            let last_insert_rowid = raw_conn.last_insert_rowid();
+            (changes, last_insert_rowid)
+        };
         let info = cx.empty_object();
         let changes = cx.number(changes as f64);
         info.set(&mut cx, "changes", changes)?;