From b012d07aa3287feb457947e71a101d89c9d6c8fe Mon Sep 17 00:00:00 2001
From: Diego Reis <reisdiego144@gmail.com>
Date: Mon, 26 May 2025 17:14:33 -0300
Subject: [PATCH] bind/js: Apply pluck's logic to all methods

---
 bindings/javascript/__test__/limbo.spec.mjs | 17 +++++++++++++++--
 bindings/javascript/src/lib.rs              | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/bindings/javascript/__test__/limbo.spec.mjs b/bindings/javascript/__test__/limbo.spec.mjs
index 9740064c5..b7ba2e6fc 100644
--- a/bindings/javascript/__test__/limbo.spec.mjs
+++ b/bindings/javascript/__test__/limbo.spec.mjs
@@ -65,13 +65,13 @@ test("Empty prepared statement should throw", async (t) => {
   );
 });
 
-test("Test pragma", async (t) => {
+test("Test pragma()", async (t) => {
   const [db] = await connect(":memory:");
   t.true(typeof db.pragma("cache_size")[0].cache_size === "number");
   t.true(typeof db.pragma("cache_size", { simple: true }) === "number");
 });
 
-test("Test bind()", async (t) => {
+test("Statement binded with bind() shouldn't be binded again", async (t) => {
   const [db] = await connect(":memory:");
   db.prepare("CREATE TABLE users (name TEXT, age INTEGER)").run();
   db.prepare("INSERT INTO users (name, age) VALUES (?, ?)").run("Alice", 42);
@@ -90,6 +90,19 @@ test("Test bind()", async (t) => {
   );
 });
 
+test("Test pluck(): Rows should only have the values of the first column", async (t) => {
+  const [db] = await connect(":memory:");
+  db.prepare("CREATE TABLE users (name TEXT, age INTEGER)").run();
+  db.prepare("INSERT INTO users (name, age) VALUES (?, ?)").run("Alice", 42);
+  db.prepare("INSERT INTO users (name, age) VALUES (?, ?)").run("Bob", 24);
+  let stmt = db.prepare("SELECT * FROM users").pluck();
+
+  for (const row of stmt.iterate()) {
+    t.truthy(row.name);
+    t.true(typeof row.age === "undefined");
+  }
+});
+
 const connect = async (path) => {
   const db = new Database(path);
   return [db];
diff --git a/bindings/javascript/src/lib.rs b/bindings/javascript/src/lib.rs
index 7d5afedc2..a46dc4f01 100644
--- a/bindings/javascript/src/lib.rs
+++ b/bindings/javascript/src/lib.rs
@@ -214,6 +214,10 @@ impl Statement {
                     let key = stmt.get_column_name(idx);
                     let js_value = to_js_value(&env, value);
                     obj.set_named_property(&key, js_value)?;
+
+                    if self.pluck {
+                        return Ok(obj.into_unknown());
+                    }
                 }
                 Ok(obj.into_unknown())
             }
@@ -245,6 +249,7 @@ impl Statement {
             stmt: Rc::clone(&self.inner),
             database: self.database.clone(),
             env,
+            plucked: self.pluck,
         })
     }
 
@@ -271,6 +276,10 @@ impl Statement {
                         let key = stmt.get_column_name(idx);
                         let js_value = to_js_value(&env, value);
                         obj.set_named_property(&key, js_value)?;
+
+                        if self.pluck {
+                            break;
+                        }
                     }
                     results.set_element(index, obj)?;
                     index += 1;
@@ -356,6 +365,7 @@ pub struct IteratorStatement {
     stmt: Rc<RefCell<limbo_core::Statement>>,
     database: Database,
     env: Env,
+    plucked: bool,
 }
 
 impl Generator for IteratorStatement {
@@ -377,6 +387,10 @@ impl Generator for IteratorStatement {
                     let key = stmt.get_column_name(idx);
                     let js_value = to_js_value(&self.env, value);
                     js_row.set_named_property(&key, js_value).ok()?;
+
+                    if self.plucked {
+                        break;
+                    }
                 }
 
                 Some(js_row)