aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-25 19:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

bindings/javascript: Fix Statement.get() implementation

Browse Source
This commit is contained in:
Pekka Enberg
2025-03-28 10:52:11 +02:00
parent 7348eb0aa1
commit 94262e4660
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bindings/javascript/__test__/better-sqlite3.spec.mjs
View File

@@ -7,11 +7,21 @@ test("Open in-memory database", async (t) => {
t.is(db.memory, true);
});
test("Statement.get()", async (t) => {
test("Statement.get() returns data", async (t) => {
const [db] = await connect(":memory:");
const stmt = db.prepare("SELECT 1");
const result = stmt.get();
t.is(result["1"], 1);
const result2 = stmt.get();
t.is(result2["1"], 1);
});
test("Statement.get() returns undefined when no data", async (t) => {
const [db] = await connect(":memory:");
const stmt = db.prepare("SELECT 1 WHERE 1 = 2");
const result = stmt.get();
t.is(result, undefined);
});
const connect = async (path) => {

12
bindings/javascript/__test__/limbo.spec.mjs
View File

@@ -7,11 +7,21 @@ test("Open in-memory database", async (t) => {
t.is(db.memory, true);
});
test("Statement.get()", async (t) => {
test("Statement.get() returns data", async (t) => {
const [db] = await connect(":memory:");
const stmt = db.prepare("SELECT 1");
const result = stmt.get();
t.is(result["1"], 1);
const result2 = stmt.get();
t.is(result2["1"], 1);
});
test("Statement.get() returns null when no data", async (t) => {
const [db] = await connect(":memory:");
const stmt = db.prepare("SELECT 1 WHERE 1 = 2");
const result = stmt.get();
t.is(result, undefined);
});
const connect = async (path) => {

14
bindings/javascript/src/lib.rs
View File

@@ -4,7 +4,7 @@ use std::cell::RefCell;
use std::rc::Rc;
use std::sync::Arc;
use napi::{Env, JsObject, JsUnknown, Result as NapiResult};
use napi::{Env, JsUnknown, Result as NapiResult};
use napi_derive::napi;
#[napi(js_name = "Database")]
@@ -69,24 +69,24 @@ impl Statement {
}
#[napi]
pub fn get(&self, env: Env) -> NapiResult<JsObject> {
pub fn get(&self, env: Env) -> NapiResult<JsUnknown> {
let mut stmt = self.inner.borrow_mut();
stmt.reset();
match stmt.step() {
Ok(limbo_core::StepResult::Row) => {
let row = stmt.row().unwrap();
let mut obj = env.create_object()?;
for (idx, value) in row.get_values().iter().enumerate() {
let key = (idx + 1).to_string();
let key = stmt.get_column_name(idx);
let js_value = to_js_value(&env, value);
obj.set_named_property(&key, js_value)?;
}
Ok(obj)
Ok(obj.into_unknown())
}
Ok(limbo_core::StepResult::Done) => Ok(env.get_undefined().unwrap().into_unknown()),
Ok(limbo_core::StepResult::IO)
| Ok(limbo_core::StepResult::Done)
| Ok(limbo_core::StepResult::Interrupt)
| Ok(limbo_core::StepResult::Busy) => Ok(env.create_object()?),
| Ok(limbo_core::StepResult::Busy) => todo!(),
Err(e) => Err(napi::Error::from_reason(format!("Database error: {:?}", e))),
}
}