Tweaks.

Author: rkistner

packages/wa-sqlite-driver/package.json

@@ -18,7 +18,7 @@
     "@journeyapps/wa-sqlite": "^1.3.2",
     "@sqlite-js/driver": "workspace:^",
     "async-mutex": "^0.5.0",
-    "wa-sqlite": "^1.0.0"
+    "wa-sqlite": "[email protected]:rhashimoto/wa-sqlite.git#v1.0.9"
   },
   "devDependencies": {
     "@sqlite-js/driver-tests": "workspace:^",

packages/wa-sqlite-driver/src/wa-sqlite-driver.ts

@@ -1,5 +1,7 @@
 import * as SQLite from '@journeyapps/wa-sqlite';
 import SQLiteESMFactory from '@journeyapps/wa-sqlite/dist/wa-sqlite-async.mjs';
+// import * as SQLite from 'wa-sqlite';
+// import SQLiteESMFactory from 'wa-sqlite/dist/wa-sqlite-async.mjs';
 import {
   PrepareOptions,
   ResetOptions,
@@ -14,10 +16,10 @@ import {
   UpdateListener
 } from '@sqlite-js/driver';
 import * as mutex from 'async-mutex';
-import { OPFSCoopSyncVFS2 } from './OPFSCoopSyncVFS2';
 
 // Initialize SQLite.
 export const module = await SQLiteESMFactory();
+console.log('module', module);
 export const sqlite3 = SQLite.Factory(module);
 
 const m = new mutex.Mutex();
@@ -233,7 +235,8 @@ class StatementImpl implements SqliteDriverStatement {
       while ((await sqlite3.step(stmt)) === SQLite.SQLITE_ROW) {}
 
       const changes = sqlite3.changes(this.db);
-      const lastInsertRowId = BigInt(sqlite3.last_insert_id(this.db));
+      // const lastInsertRowId = BigInt(sqlite3.last_insert_id(this.db));
+      const lastInsertRowId = 0n;
 
       return { changes, lastInsertRowId };
     } catch (e: any) {
@@ -253,26 +256,20 @@ class StatementImpl implements SqliteDriverStatement {
 
 export class WaSqliteConnection implements SqliteDriverConnection {
   db: number;
-  vfs: OPFSCoopSyncVFS2;
 
   statements = new Set<StatementImpl>();
 
-  static async open(
-    filename: string,
-    vfs: OPFSCoopSyncVFS2
-  ): Promise<WaSqliteConnection> {
+  static async open(filename: string): Promise<WaSqliteConnection> {
     // Open the database.
     const db = await sqlite3.open_v2(filename);
-    return new WaSqliteConnection(db, vfs, filename);
+    return new WaSqliteConnection(db, filename);
   }
 
   constructor(
     db: number,
-    vfs: OPFSCoopSyncVFS2,
     public path: string
   ) {
     this.db = db;
-    this.vfs = vfs;
   }
 
   async close() {
@@ -290,7 +287,8 @@ export class WaSqliteConnection implements SqliteDriverConnection {
 
   async getLastChanges(): Promise<SqliteChanges> {
     const changes = sqlite3.changes(this.db);
-    const lastInsertRowId = BigInt(sqlite3.last_insert_id(this.db));
+    // const lastInsertRowId = BigInt(sqlite3.last_insert_id(this.db));
+    const lastInsertRowId = 0n;
 
     return { changes, lastInsertRowId };
   }

packages/wa-sqlite-driver/src/wa-sqlite-worker.ts

@@ -4,6 +4,8 @@ import { setupDriverWorker } from './worker_threads';
 import { IDBBatchAtomicVFS } from '@journeyapps/wa-sqlite/src/examples/IDBBatchAtomicVFS.js';
 import { OPFSAdaptiveVFS } from '@journeyapps/wa-sqlite/src/examples/OPFSAdaptiveVFS.js';
 import { OPFSPermutedVFS } from '@journeyapps/wa-sqlite/src/examples/OPFSPermutedVFS.js';
+import { IDBBatchAtomicVFS as IDBBatchAtomicVFS0 } from 'wa-sqlite/src/examples/IDBBatchAtomicVFS.js';
+
 let vfs: any | null = null;
 setupDriverWorker({
   async openConnection(options) {
@@ -17,7 +19,7 @@ setupDriverWorker({
     //   options.readonly ?? false
     // );
     // IDBBatchAtomicVFS - breaks hard (database disk image is malformed)
-    // vfs = await (IDBBatchAtomicVFS as any).create('test.db', module);
+    vfs = await (IDBBatchAtomicVFS0 as any).create('test.db', module);
     // OPFSAdaptiveVFS - works great
     // vfs = await (OPFSAdaptiveVFS as any).create('test.db', module, {
     //   ifAvailable: true,
@@ -29,12 +31,12 @@ setupDriverWorker({
     // });
 
     // database disk image is malformed
-    vfs = await (OPFSPermutedVFS as any).create('test.db', module);
+    // vfs = await (OPFSPermutedVFS as any).create('test.db', module);
 
     // @ts-ignore
     sqlite3.vfs_register(vfs as any, true);
 
-    const con = await WaSqliteConnection.open(options.path, vfs);
+    const con = await WaSqliteConnection.open(options.path);
     using stmt = await con.prepare('PRAGMA busy_timeout = 10000');
     await stmt.step();
     return con;