Skip to content

Commit 285d610

Browse files
committed
fix: await beforeOpen
1 parent 7ddaee7 commit 285d610

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/core.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export async function initSQLiteCore(
4040
const sqlite = Factory(sqliteModule)
4141
const vfs = await vfsFn(path, sqliteModule, vfsOptions)
4242
sqlite.vfs_register(vfs as unknown as SQLiteVFS, true)
43-
beforeOpen?.(vfs, path)
43+
await beforeOpen?.(vfs, path)
4444
const pointer = await sqlite.open_v2(
4545
path,
4646
readonly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
@@ -57,14 +57,15 @@ export async function initSQLiteCore(
5757
}
5858

5959
export async function close(core: SQLiteDBCore): Promise<void> {
60-
await core.sqlite.close(core.db)
60+
await core.sqlite.close(core.pointer)
61+
await core.vfs.close()
6162
}
6263
export function changes(core: SQLiteDBCore): number | bigint {
63-
return core.sqliteModule._sqlite3_changes(core.db)
64+
return core.sqliteModule._sqlite3_changes(core.pointer)
6465
}
6566

6667
export function lastInsertRowId(core: SQLiteDBCore): number | bigint {
67-
return core.sqliteModule._sqlite3_last_insert_rowid(core.db)
68+
return core.sqliteModule._sqlite3_last_insert_rowid(core.pointer)
6869
}
6970

7071
export async function stream(
@@ -73,8 +74,8 @@ export async function stream(
7374
sql: string,
7475
parameters?: SQLiteCompatibleType[],
7576
): Promise<void> {
76-
const { sqlite, db } = core
77-
for await (const stmt of sqlite.statements(db, sql)) {
77+
const { sqlite, pointer } = core
78+
for await (const stmt of sqlite.statements(pointer, sql)) {
7879
if (parameters?.length) {
7980
sqlite.bind_collection(stmt, parameters)
8081
}

src/io/import.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,11 @@ export async function importDatabaseStream(
135135
* @param path db path
136136
* @param data existing database
137137
*/
138-
export async function importDatabase(vfs: FacadeVFS, path: string, data: File | ReadableStream): Promise<void> {
138+
export async function importDatabase(
139+
vfs: FacadeVFS,
140+
path: string,
141+
data: File | ReadableStream<Uint8Array>,
142+
): Promise<void> {
139143
return await importDatabaseStream(
140144
vfs,
141145
path,

0 commit comments

Comments
 (0)