This commit is contained in:
Jordan Wages 2025-09-19 01:11:26 -05:00
commit 6d39865db4

View file

@ -282,6 +282,16 @@
return `${hz.toLocaleString()} Hz`;
}
function escapeSqlText(value) {
return `'${String(value).replace(/'/g, "''")}'`;
}
function applyFtsMatch(sql, matchExpr) {
const placeholder = 'MATCH ?';
if (!sql.includes(placeholder)) throw new Error('Expected FTS MATCH placeholder');
return sql.replace(placeholder, `MATCH ${escapeSqlText(matchExpr)}`);
}
async function unzipSqlite(zipBytes) {
loader.setStep('Unpacking database…');
loader.setDetail('Decompressing ZIP');
@ -950,11 +960,10 @@
try {
console.debug('[Search] Preparing count query', {
sql: countSql.trim(),
params: [matchExpr],
ftsExpr: matchExpr,
chars: Array.from(matchExpr).map((ch) => ch.codePointAt(0)),
});
const countStmt = db.prepare(countSql);
countStmt.bind([matchExpr]);
const countStmt = db.prepare(applyFtsMatch(countSql, matchExpr));
if (countStmt.step()) {
const row = countStmt.getAsObject();
total = Number(row.count) || 0;
@ -971,13 +980,14 @@
state.page = Math.max(1, Math.ceil(total / state.pageSize));
}
const searchParams = [matchExpr, state.pageSize, (state.page - 1) * state.pageSize];
const searchParams = [state.pageSize, (state.page - 1) * state.pageSize];
console.debug('[Search] Preparing row query', {
sql: effectiveSearchSql.trim(),
ftsExpr: matchExpr,
params: searchParams,
chars: Array.from(matchExpr).map((ch) => ch.codePointAt(0)),
});
const searchStmt = db.prepare(effectiveSearchSql);
const searchStmt = db.prepare(applyFtsMatch(effectiveSearchSql, matchExpr));
searchStmt.bind(searchParams);
const nextRows = [];
while (searchStmt.step()) {
@ -1184,15 +1194,14 @@
try {
if (ftsMatch) {
const ftsCountStmt = db.prepare(ftsCountSql);
ftsCountStmt.bind([ftsMatch]);
const ftsCountStmt = db.prepare(applyFtsMatch(ftsCountSql, ftsMatch));
if (ftsCountStmt.step()) total = Number(ftsCountStmt.getAsObject().count) || 0;
ftsCountStmt.free();
if (total > 0) {
if (offset >= total) state.page = Math.max(1, Math.ceil(total / state.pageSize));
const ftsRowsStmt = db.prepare(ftsRowsSql);
ftsRowsStmt.bind([ftsMatch, state.pageSize, (state.page - 1) * state.pageSize]);
const ftsRowsStmt = db.prepare(applyFtsMatch(ftsRowsSql, ftsMatch));
ftsRowsStmt.bind([state.pageSize, (state.page - 1) * state.pageSize]);
while (ftsRowsStmt.step()) rows.push(ftsRowsStmt.getAsObject());
ftsRowsStmt.free();
usedFts = true;