fix(P6): convert positional bindings to named-params object for better-sqlite3
This commit is contained in:
@@ -6,8 +6,10 @@
|
|||||||
// (<1ms per op for the current workload).
|
// (<1ms per op for the current workload).
|
||||||
//
|
//
|
||||||
// Binding param style: Tauri's plugin-sql used $1, $2... positionals with
|
// Binding param style: Tauri's plugin-sql used $1, $2... positionals with
|
||||||
// bindings as an array. SQLite natively accepts $N so existing queries
|
// bindings as an array. SQLite parses `$NAME` as a NAMED parameter
|
||||||
// keep working unmodified.
|
// (NAME = `1`, `2`, …), not as positional, so better-sqlite3 wants the
|
||||||
|
// bindings as `{ '1': v1, '2': v2 }` not `[v1, v2]`. We accept the old
|
||||||
|
// array-shape from callers and convert to the named-object on the way in.
|
||||||
|
|
||||||
import { app, ipcMain } from 'electron';
|
import { app, ipcMain } from 'electron';
|
||||||
import Database from 'better-sqlite3';
|
import Database from 'better-sqlite3';
|
||||||
@@ -40,6 +42,20 @@ function requireHandle(h: string): Handle {
|
|||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Convert a positional bindings array `[v1, v2]` to the named-params object
|
||||||
|
// `{ '1': v1, '2': v2 }` that better-sqlite3 needs when the SQL uses
|
||||||
|
// `$1`/`$2` named placeholders. Returns the original array (spread later)
|
||||||
|
// when it's empty.
|
||||||
|
function bindParams(bindings: unknown[] | undefined): Record<string, unknown> | [] {
|
||||||
|
const arr = bindings ?? [];
|
||||||
|
if (arr.length === 0) return [];
|
||||||
|
const obj: Record<string, unknown> = {};
|
||||||
|
for (let i = 0; i < arr.length; i++) {
|
||||||
|
obj[String(i + 1)] = arr[i];
|
||||||
|
}
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
export function register(): void {
|
export function register(): void {
|
||||||
ipcMain.handle(CHANNELS.SQL_LOAD, async (_evt, args: SqlLoadArgs): Promise<string> => {
|
ipcMain.handle(CHANNELS.SQL_LOAD, async (_evt, args: SqlLoadArgs): Promise<string> => {
|
||||||
const rawName = stripPrefix(args.name);
|
const rawName = stripPrefix(args.name);
|
||||||
@@ -59,7 +75,8 @@ export function register(): void {
|
|||||||
async (_evt, args: SqlExecuteArgs): Promise<SqlExecuteResult> => {
|
async (_evt, args: SqlExecuteArgs): Promise<SqlExecuteResult> => {
|
||||||
const entry = requireHandle(args.handle);
|
const entry = requireHandle(args.handle);
|
||||||
const stmt = entry.db.prepare(args.query);
|
const stmt = entry.db.prepare(args.query);
|
||||||
const info = stmt.run(...((args.bindings ?? []) as unknown[]));
|
const params = bindParams(args.bindings);
|
||||||
|
const info = Array.isArray(params) ? stmt.run() : stmt.run(params);
|
||||||
return {
|
return {
|
||||||
rowsAffected: info.changes,
|
rowsAffected: info.changes,
|
||||||
lastInsertId:
|
lastInsertId:
|
||||||
@@ -75,7 +92,11 @@ export function register(): void {
|
|||||||
async (_evt, args: SqlSelectArgs): Promise<SqlSelectResult> => {
|
async (_evt, args: SqlSelectArgs): Promise<SqlSelectResult> => {
|
||||||
const entry = requireHandle(args.handle);
|
const entry = requireHandle(args.handle);
|
||||||
const stmt = entry.db.prepare(args.query);
|
const stmt = entry.db.prepare(args.query);
|
||||||
const rows = stmt.all(...((args.bindings ?? []) as unknown[])) as Record<string, unknown>[];
|
const params = bindParams(args.bindings);
|
||||||
|
const rows = (Array.isArray(params) ? stmt.all() : stmt.all(params)) as Record<
|
||||||
|
string,
|
||||||
|
unknown
|
||||||
|
>[];
|
||||||
return rows;
|
return rows;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user