aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-10 02:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'bind/javascript: Fix presentation mode disabling logic' from Diego Reis

Browse Source 
Presentation mode disabling logic was ~obviously~ wrong (my bad), it's
fixed now.

Closes #2125
This commit is contained in:
Pekka Enberg
2025-07-17 10:51:15 +03:00
parent 99cdcf5348 21882d1db3
commit 45c77f5e07
2 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
bindings/javascript/__test__/sync.spec.mjs
View File

@@ -185,27 +185,61 @@ dualTest.both("Statement.all() [pluck]", async (t) => {
t.deepEqual(stmt.pluck().all(), expected);
});
dualTest.onlySqlitePasses("Statement.all() [default safe integers]", async (t) => {
const db = t.context.db;
db.defaultSafeIntegers();
const stmt = db.prepare("SELECT * FROM users");
const expected = [
[1n, "Alice", "alice@example.org"],
[2n, "Bob", "bob@example.com"],
];
t.deepEqual(stmt.raw().all(), expected);
});
dualTest.both(
"Statement.raw() [passing false should disable raw mode]",
async (t) => {
const db = t.context.db;
dualTest.onlySqlitePasses("Statement.all() [statement safe integers]", async (t) => {
const db = t.context.db;
const stmt = db.prepare("SELECT * FROM users");
stmt.safeIntegers();
const expected = [
[1n, "Alice", "alice@example.org"],
[2n, "Bob", "bob@example.com"],
];
t.deepEqual(stmt.raw().all(), expected);
});
const stmt = db.prepare("SELECT * FROM users");
const expected = [
{ id: 1, name: "Alice", email: "alice@example.org" },
{ id: 2, name: "Bob", email: "bob@example.com" },
];
t.deepEqual(stmt.raw(false).all(), expected);
},
);
dualTest.both(
"Statement.pluck() [passing false should disable pluck mode]",
async (t) => {
const db = t.context.db;
const stmt = db.prepare("SELECT * FROM users");
const expected = [
{ id: 1, name: "Alice", email: "alice@example.org" },
{ id: 2, name: "Bob", email: "bob@example.com" },
];
t.deepEqual(stmt.pluck(false).all(), expected);
},
);
dualTest.onlySqlitePasses(
"Statement.all() [default safe integers]",
async (t) => {
const db = t.context.db;
db.defaultSafeIntegers();
const stmt = db.prepare("SELECT * FROM users");
const expected = [
[1n, "Alice", "alice@example.org"],
[2n, "Bob", "bob@example.com"],
];
t.deepEqual(stmt.raw().all(), expected);
},
);
dualTest.onlySqlitePasses(
"Statement.all() [statement safe integers]",
async (t) => {
const db = t.context.db;
const stmt = db.prepare("SELECT * FROM users");
stmt.safeIntegers();
const expected = [
[1n, "Alice", "alice@example.org"],
[2n, "Bob", "bob@example.com"],
];
t.deepEqual(stmt.raw().all(), expected);
},
);
dualTest.onlySqlitePasses("Statement.raw() [failure]", async (t) => {
const db = t.context.db;

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

@@ -450,11 +450,10 @@ impl Statement {
#[napi]
pub fn pluck(&mut self, pluck: Option<bool>) {
if let Some(false) = pluck {
self.presentation_mode = PresentationMode::None;
}
self.presentation_mode = PresentationMode::Pluck;
self.presentation_mode = match pluck {
Some(false) => PresentationMode::None,
_ => PresentationMode::Pluck,
};
}
#[napi]
@@ -464,11 +463,10 @@ impl Statement {
#[napi]
pub fn raw(&mut self, raw: Option<bool>) {
if let Some(false) = raw {
self.presentation_mode = PresentationMode::None;
}
self.presentation_mode = PresentationMode::Raw;
self.presentation_mode = match raw {
Some(false) => PresentationMode::None,
_ => PresentationMode::Raw,
};
}
#[napi]