Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/dialect-wasm/src/dialects/official-wasm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class OfficialWasmDialect extends GenericSqliteDialect {
if (!isSelect) {
throw new Error('Only support select query')
}
return runWithStatement(db, sql, parameters, iterator)
return iterateWithStatement(db, sql, parameters)
},
}
}, config.onCreateConnection)
Expand All @@ -103,10 +103,22 @@ function runWithStatement<T>(
function* iterator(
statement: import('@sqlite.org/sqlite-wasm').PreparedStatement,
): IterableIterator<Record<string, import('@sqlite.org/sqlite-wasm').SqlValue>> {
while (statement.step()) {
yield statement.get({})
}
}

function* iterateWithStatement(
db: import('@sqlite.org/sqlite-wasm').Database,
sql: string,
parameters: any[] | readonly any[],
): IterableIterator<Record<string, import('@sqlite.org/sqlite-wasm').SqlValue>> {
const statement = db.prepare(sql)
try {
while (statement.step()) {
yield statement.get({})
if (parameters.length) {
statement.bind(parameters as import('@sqlite.org/sqlite-wasm').BindingSpec)
}
yield* iterator(statement)
} finally {
statement.finalize()
}
Expand Down
25 changes: 10 additions & 15 deletions packages/dialect-wasm/src/dialects/sqljs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,36 +45,31 @@ export class SqlJsDialect extends GenericSqliteDialect {
if (!isSelect) {
throw new Error('Only support select query')
}
return runWithStatement(db, sql, parameters, iterator)
return iterateWithStatement(db, sql, parameters)
},
}
}, config.onCreateConnection)
}
}

function runWithStatement<T>(
function* iterator<T>(stmt: import('sql.js').Statement): IterableIterator<T> {
while (stmt.step()) {
yield stmt.getAsObject() as unknown as T
}
}

function* iterateWithStatement<T>(
db: import('sql.js').Database,
sql: string,
parameters: any[] | readonly any[],
callback: (stmt: import('sql.js').Statement) => T,
): T {
): IterableIterator<T> {
const statement = db.prepare(sql)
try {
if (parameters.length) {
statement.bind(parameters as any[])
}
return callback(statement)
yield* iterator(statement)
} finally {
statement.free()
}
}

function* iterator<T>(stmt: import('sql.js').Statement): IterableIterator<T> {
try {
while (stmt.step()) {
yield stmt.getAsObject() as unknown as T
}
} finally {
stmt.free()
}
}
2 changes: 1 addition & 1 deletion packages/dialect-wasm/test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('dialect test', () => {
return new SQL.Database()
},
})
await testCase(dialect, expect, false)
await testCase(dialect, expect)
})

it('node-wasm', async () => {
Expand Down