@syncular/dialect-expo-sqlite 0.0.1-116 → 0.0.1-120

package/dist/index.js

@@ -72,12 +72,17 @@ class ExpoSqliteDriver {
     }
     async init() {
         this.#db = this.#resolveDatabase();
+        // Enable WAL mode for better concurrency (allows concurrent reads
+        // while writing, prevents "database is locked" errors during sync).
+        this.#db.runSync('PRAGMA journal_mode = WAL', []);
+        // Wait up to 5s for locks to clear instead of failing immediately.
+        this.#db.runSync('PRAGMA busy_timeout = 5000', []);
     }
     async acquireConnection() {
         return new ExpoSqliteConnection(this.#db);
     }
     async beginTransaction(connection, _settings) {
-        await connection.executeQuery(CompiledQuery.raw('begin'));
+        await connection.executeQuery(CompiledQuery.raw('begin immediate'));
     }
     async commitTransaction(connection) {
         await connection.executeQuery(CompiledQuery.raw('commit'));

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/dialect-expo-sqlite",
-  "version": "0.0.1-116",
+  "version": "0.0.1-120",
   "description": "Expo SQLite dialect for the Syncular client",
   "license": "MIT",
   "author": "Benjamin Kniffler",
@@ -43,7 +43,7 @@
     "release": "bunx syncular-publish"
   },
   "dependencies": {
-    "@syncular/core": "0.0.1-116"
+    "@syncular/core": "0.0.1-120"
   },
   "peerDependencies": {
     "expo-sqlite": "^16.0.10",

package/src/index.test.ts

@@ -1,5 +1,6 @@
+import { Database } from 'bun:sqlite';
 import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
-import type { Kysely } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 import type {
   ExpoSqliteBindParams,
   ExpoSqliteBindValue,
@@ -61,9 +62,18 @@ describe('expo sqlite dialect RETURNING behavior', () => {
   let fakeDb: FakeExpoDatabase;
   let db: Kysely<TestDb>;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     fakeDb = new FakeExpoDatabase();
     db = createExpoSqliteDb<TestDb>({ database: fakeDb });
+    // Run a no-op query to trigger driver init (PRAGMA statements).
+    // Then clear the tracking arrays so tests only see their own SQL.
+    await db
+      .selectFrom('tasks' as any)
+      .selectAll()
+      .execute()
+      .catch(() => {});
+    fakeDb.getAllSql.length = 0;
+    fakeDb.runSql.length = 0;
   });
 
   it('routes UPDATE ... RETURNING through getAllSync and returns rows', async () => {
@@ -94,3 +104,142 @@ describe('expo sqlite dialect RETURNING behavior', () => {
     await db.destroy();
   });
 });
+
+/**
+ * Adapter that wraps bun:sqlite Database to match ExpoSqliteDatabaseLike,
+ * so we can run real SQLite concurrency tests without expo-sqlite.
+ */
+class BunSqliteAdapter implements ExpoSqliteDatabaseLike {
+  readonly #db: Database;
+
+  constructor(path = ':memory:') {
+    this.#db = new Database(path);
+  }
+
+  getAllSync<R>(sqlStr: string, params: ExpoSqliteBindParams): R[];
+  getAllSync<R>(sqlStr: string, ...params: readonly ExpoSqliteBindValue[]): R[];
+  getAllSync<R>(
+    sqlStr: string,
+    ...paramsOrFirst:
+      | readonly [ExpoSqliteBindParams]
+      | readonly ExpoSqliteBindValue[]
+  ): R[] {
+    const p = this.#resolveParams(paramsOrFirst);
+    return this.#db.prepare(sqlStr).all(...p) as R[];
+  }
+
+  runSync(sqlStr: string, params: ExpoSqliteBindParams): ExpoSqliteRunResult;
+  runSync(
+    sqlStr: string,
+    ...params: readonly ExpoSqliteBindValue[]
+  ): ExpoSqliteRunResult;
+  runSync(
+    sqlStr: string,
+    ...paramsOrFirst:
+      | readonly [ExpoSqliteBindParams]
+      | readonly ExpoSqliteBindValue[]
+  ): ExpoSqliteRunResult {
+    const p = this.#resolveParams(paramsOrFirst);
+    const result = this.#db.run(sqlStr, ...p);
+    return {
+      changes: result.changes,
+      lastInsertRowId: Number(result.lastInsertRowid),
+    };
+  }
+
+  closeSync(): void {
+    this.#db.close();
+  }
+
+  #resolveParams(
+    paramsOrFirst:
+      | readonly [ExpoSqliteBindParams]
+      | readonly ExpoSqliteBindValue[]
+  ): ExpoSqliteBindValue[] {
+    if (paramsOrFirst.length === 1 && Array.isArray(paramsOrFirst[0])) {
+      return paramsOrFirst[0] as ExpoSqliteBindValue[];
+    }
+    return paramsOrFirst as ExpoSqliteBindValue[];
+  }
+}
+
+interface ConcurrencyDb {
+  items: { id: number; value: string };
+}
+
+describe('expo sqlite dialect concurrency (real SQLite)', () => {
+  let adapter: BunSqliteAdapter;
+  let db: Kysely<ConcurrencyDb>;
+
+  beforeEach(async () => {
+    adapter = new BunSqliteAdapter();
+    db = createExpoSqliteDb<ConcurrencyDb>({ database: adapter });
+    await sql`create table items (id integer primary key, value text)`.execute(
+      db
+    );
+  });
+
+  afterEach(async () => {
+    await db.destroy();
+  });
+
+  it('concurrent transaction + read does not deadlock', async () => {
+    // Seed data
+    for (let i = 0; i < 100; i++) {
+      await db
+        .insertInto('items')
+        .values({ id: i, value: `v${i}` })
+        .execute();
+    }
+
+    // Simulate sync engine: long-running write transaction
+    const writeTx = db.transaction().execute(async (trx) => {
+      for (let i = 100; i < 200; i++) {
+        await trx
+          .insertInto('items')
+          .values({ id: i, value: `tx-${i}` })
+          .execute();
+      }
+      // Yield to allow the concurrent read to interleave
+      await new Promise((r) => setTimeout(r, 10));
+      for (let i = 200; i < 300; i++) {
+        await trx
+          .insertInto('items')
+          .values({ id: i, value: `tx-${i}` })
+          .execute();
+      }
+    });
+
+    // Simulate React hook: concurrent read while transaction is open
+    const readResult = db.selectFrom('items').select(['id', 'value']).execute();
+
+    // Both should complete without "database is locked"
+    const [, rows] = await Promise.all([writeTx, readResult]);
+    expect(rows.length).toBeGreaterThanOrEqual(100);
+  });
+
+  it('sequential write transactions complete without error', async () => {
+    await db.transaction().execute(async (trx) => {
+      for (let i = 0; i < 50; i++) {
+        await trx
+          .insertInto('items')
+          .values({ id: i, value: `a-${i}` })
+          .execute();
+      }
+    });
+
+    await db.transaction().execute(async (trx) => {
+      for (let i = 1000; i < 1050; i++) {
+        await trx
+          .insertInto('items')
+          .values({ id: i, value: `b-${i}` })
+          .execute();
+      }
+    });
+
+    const { rows } = await sql<{
+      cnt: number;
+    }>`select count(*) as cnt from items`.execute(db);
+    expect(rows[0].cnt).toBe(100);
+  });
+});

package/src/index.ts

@@ -143,6 +143,11 @@ class ExpoSqliteDriver implements Driver {
 
   async init(): Promise<void> {
     this.#db = this.#resolveDatabase();
+    // Enable WAL mode for better concurrency (allows concurrent reads
+    // while writing, prevents "database is locked" errors during sync).
+    this.#db.runSync('PRAGMA journal_mode = WAL', []);
+    // Wait up to 5s for locks to clear instead of failing immediately.
+    this.#db.runSync('PRAGMA busy_timeout = 5000', []);
   }
 
   async acquireConnection(): Promise<DatabaseConnection> {
@@ -153,7 +158,7 @@ class ExpoSqliteDriver implements Driver {
     connection: DatabaseConnection,
     _settings: TransactionSettings
   ): Promise<void> {
-    await connection.executeQuery(CompiledQuery.raw('begin'));
+    await connection.executeQuery(CompiledQuery.raw('begin immediate'));
   }
 
   async commitTransaction(connection: DatabaseConnection): Promise<void> {