diff --git a/src/main/sqlite/node-sqlite-statement.ts b/src/main/sqlite/node-sqlite-statement.ts index 53a83108086..17ca3398de3 100644 --- a/src/main/sqlite/node-sqlite-statement.ts +++ b/src/main/sqlite/node-sqlite-statement.ts @@ -2,16 +2,43 @@ import type { StatementResultingChanges } from 'node:sqlite' import { SqliteIntegerReader } from './sqlite-integer-reader' import type { SqliteBindings, SqliteRow, SqliteStatement } from './sqlite-statement' +// SQLite retains bound text/blob values until rebinding or statement finalization. +const LARGE_BINDING_BYTES = 64 * 1024 + +function hasLargeBinding(parameters: SqliteBindings): boolean { + let bytes = 0 + for (const value of parameters) { + bytes += + typeof value === 'string' ? value.length : ArrayBuffer.isView(value) ? value.byteLength : 0 + if (bytes > LARGE_BINDING_BYTES) { + return true + } + } + return false +} + export class NodeSqliteStatement implements SqliteStatement { private readonly integers = new SqliteIntegerReader() - constructor(private readonly statement: SqliteStatement) { + private readonly statement: SqliteStatement + + constructor(private readonly prepare: () => SqliteStatement) { + this.statement = this.prepareStatement() + } + + private prepareStatement(): SqliteStatement { + const statement = this.prepare() // Native number reads overflow their INT64_MIN guard on some builds and round insert rowids. statement.setReadBigInts(true) + return statement + } + + private execution(parameters: SqliteBindings): SqliteStatement { + return hasLargeBinding(parameters) ? this.prepareStatement() : this.statement } all(...parameters: SqliteBindings): SqliteRow[] { - const rows = this.statement.all(...parameters) + const rows = this.execution(parameters).all(...parameters) for (const row of rows) { this.integers.row(row) } @@ -19,17 +46,25 @@ export class NodeSqliteStatement implements SqliteStatement { } get(...parameters: SqliteBindings): SqliteRow | undefined { - const row = this.statement.get(...parameters) + const row = this.execution(parameters).get(...parameters) return row === undefined ? undefined : this.integers.row(row) } run(...parameters: SqliteBindings): StatementResultingChanges { - return this.integers.result(this.statement.run(...parameters)) + return this.integers.result(this.execution(parameters).run(...parameters)) } *iterate(...parameters: SqliteBindings): IterableIterator { - for (const row of this.statement.iterate(...parameters)) { - yield this.integers.row(row) + let rows: IterableIterator | undefined + try { + rows = this.execution(parameters).iterate(...parameters) + parameters.length = 0 + for (const row of rows) { + yield this.integers.row(row) + } + } finally { + rows = undefined + parameters.length = 0 } } diff --git a/src/main/sqlite/sync-database.ts b/src/main/sqlite/sync-database.ts index 152cf740043..58ff0bf7532 100644 --- a/src/main/sqlite/sync-database.ts +++ b/src/main/sqlite/sync-database.ts @@ -102,7 +102,7 @@ class SyncDatabase { this.statementCache.set(sql, cached) return cached } - const statement = new NodeSqliteStatement(this.db.prepare(sql)) + const statement = new NodeSqliteStatement(() => this.db.prepare(sql)) if (isStatementCacheable(sql)) { if (this.statementCache.size >= STATEMENT_CACHE_LIMIT) { const oldest = this.statementCache.keys().next().value