velocious 1.0.706 → 1.0.707

package/build/database/drivers/sqlite/index.native.js

@@ -7,29 +7,17 @@ import query from "./query"
 // @ts-expect-error
 import * as SQLite from "expo-sqlite"
 
-import Mutex from "epic-locks/build/mutex.js"
-
 import Base from "./base.js"
+import {nativeDatabaseMutex, runNativeOperation} from "./native-query-gate.js"
 
 export default class VelociousDatabaseDriversSqliteNative extends Base {
-  /**
-   * Serializes native queries so concurrent `getAllAsync` calls never race
-   * `expo-sqlite`'s shared `NativeStatement` objects (a single connection
-   * prepares/executes/finalizes one statement at a time).
-   * @type {Mutex}
-   */
-  _queryMutex = new Mutex()
-
   async connect() {
     const {isBrowser, isNative, isServer} = envSense()
 
     if (!isNative) throw new Error(`SQLite native driver running inside non-native environment: ${JSON.stringify({isBrowser, isNative, isServer})}`)
 
     const args = this.getArgs()
-
-    if (!args.name) throw new Error("No name given for SQLite Native")
-
-    const databaseName = args.name
+    const databaseName = this._databaseName()
 
     if (args.reset) {
       try {
@@ -43,7 +31,9 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
       }
     }
 
-    this.connection = await SQLite.openDatabaseAsync(databaseName)
+    // expo-sqlite caches native databases by name. A shared cache means closing
+    // one driver's handle closes every other driver's handle for that database.
+    this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})
     await this.registerVersion()
   }
 
@@ -64,14 +54,31 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
     return connectArgs
   }
 
+  /**
+   * Returns the configured SQLite database name.
+   * @returns {string} - Database name.
+   */
+  _databaseName() {
+    const databaseName = this.getArgs().name
+
+    if (!databaseName) throw new Error("No name given for SQLite Native")
+
+    return databaseName
+  }
+
   async _close() {
-    await this.connection.closeAsync()
-    this.connection = undefined
+    const databaseName = this._databaseName()
+
+    await nativeDatabaseMutex(databaseName).sync(async () => {
+      const connection = this.connection
+
+      this.connection = undefined
+      await connection?.closeAsync()
+    })
   }
 
   async deleteDatabaseStorage() {
-    const databaseName = this.getArgs().name
-    if (!databaseName) throw new Error("No name given for SQLite Native")
+    const databaseName = this._databaseName()
     try {
       await SQLite.deleteDatabaseAsync(databaseName)
     } catch (error) {
@@ -86,15 +93,24 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
    * @returns {Promise<Record<string, ReturnType<typeof JSON.parse>>[]>} - Query result rows.
    */
   async _queryActual(sql, options = {}) {
-    return await this._queryMutex.sync(async () => {
-      if (!this.connection) throw new Error("Not connected yet")
+    const databaseName = this._databaseName()
+
+    return await runNativeOperation({
+      databaseName,
+      getConnection: () => this.connection,
+      reopenConnection: async () => {
+        this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})
+
+        return this.connection
+      },
+      operation: async (connection) => {
+        if (options.sqliteScript) {
+          await connection.execAsync(sql)
+          return []
+        }
 
-      if (options.sqliteScript) {
-        await this.connection.execAsync(sql)
-        return []
+        return await query(connection, sql)
       }
-
-      return await query(this.connection, sql)
     })
   }
 
@@ -104,10 +120,21 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
    * @returns {Promise<number>} - Affected row count.
    */
   async _affectedRowsActual(sql) {
-    return await this._queryMutex.sync(async () => {
-      if (!this.connection) throw new Error("Not connected yet")
-      const result = await this.connection.runAsync(sql)
-      return result.changes
+    const databaseName = this._databaseName()
+
+    return await runNativeOperation({
+      databaseName,
+      getConnection: () => this.connection,
+      reopenConnection: async () => {
+        this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})
+
+        return this.connection
+      },
+      operation: async (connection) => {
+        const result = await connection.runAsync(sql)
+
+        return result.changes
+      }
     })
   }
 }

package/build/database/drivers/sqlite/native-query-gate.js

@@ -0,0 +1,73 @@
+// @ts-check
+
+import Mutex from "epic-locks/build/mutex.js"
+
+/**
+ * @typedef {object} NativeSqliteConnection
+ * @property {(sql: string) => Promise<Array<Record<string, ReturnType<typeof JSON.parse>>>>} getAllAsync - Reads rows.
+ * @property {(sql: string) => Promise<{changes: number}>} runAsync - Runs a mutation.
+ * @property {(sql: string) => Promise<void>} execAsync - Executes a SQL script.
+ * @property {() => Promise<void>} closeAsync - Closes the native connection.
+ */
+
+/** @type {Map<string, Mutex>} */
+const mutexesByDatabaseName = new Map()
+
+/**
+ * Returns the process-wide native query gate for one SQLite database name.
+ * expo-sqlite caches native databases by name, so a gate scoped to a driver
+ * instance is not enough: two drivers on the same database can still release
+ * each other's shared `NativeStatement` objects.
+ * @param {string} databaseName - SQLite database name.
+ * @returns {Mutex} Mutex serializing native calls for that database.
+ */
+export function nativeDatabaseMutex(databaseName) {
+  let mutex = mutexesByDatabaseName.get(databaseName)
+
+  if (!mutex) {
+    mutex = new Mutex()
+    mutexesByDatabaseName.set(databaseName, mutex)
+  }
+
+  return mutex
+}
+
+/**
+ * Whether an expo-sqlite error means the native database/statement was released.
+ * @param {unknown} error - Thrown error.
+ * @returns {boolean} Whether the error is the native-handle lifetime failure.
+ */
+export function isNativeHandleError(error) {
+  const message = error instanceof Error ? error.message : String(error)
+  const causeMessage = error instanceof Error && error.cause instanceof Error ? error.cause.message : ""
+  const text = `${message} ${causeMessage}`
+
+  return /NativeStatement\.runAsync|NativeDatabase\.prepareAsync/.test(text) && /NullPointerException|already released/.test(text)
+}
+
+/**
+ * Runs one native operation under the per-database gate, reopening once when
+ * expo-sqlite reports the shared native handle was released.
+ * @template T
+ * @param {object} args - Operation args.
+ * @param {string} args.databaseName - SQLite database name.
+ * @param {() => NativeSqliteConnection | undefined} args.getConnection - Current connection getter.
+ * @param {() => Promise<NativeSqliteConnection>} args.reopenConnection - Opens a fresh native connection.
+ * @param {(connection: NativeSqliteConnection) => Promise<T>} args.operation - Operation to run.
+ * @returns {Promise<T>} Operation result.
+ */
+export async function runNativeOperation({databaseName, getConnection, reopenConnection, operation}) {
+  return await nativeDatabaseMutex(databaseName).sync(async () => {
+    const connection = getConnection()
+
+    if (!connection) throw new Error("Not connected yet")
+
+    try {
+      return await operation(connection)
+    } catch (error) {
+      if (!isNativeHandleError(error)) throw error
+
+      return await operation(await reopenConnection())
+    }
+  })
+}

package/build/src/database/drivers/sqlite/index.native.d.ts

@@ -1,16 +1,13 @@
-import Mutex from "epic-locks/build/mutex.js";
 import Base from "./base.js";
 export default class VelociousDatabaseDriversSqliteNative extends Base {
     connection: any;
-    /**
-     * Serializes native queries so concurrent `getAllAsync` calls never race
-     * `expo-sqlite`'s shared `NativeStatement` objects (a single connection
-     * prepares/executes/finalizes one statement at a time).
-     * @type {Mutex}
-     */
-    _queryMutex: Mutex;
     connect(): Promise<void>;
     connectArgs(): Record<string, any>;
+    /**
+     * Returns the configured SQLite database name.
+     * @returns {string} - Database name.
+     */
+    _databaseName(): string;
     _close(): Promise<void>;
     deleteDatabaseStorage(): Promise<void>;
     /**

package/build/src/database/drivers/sqlite/index.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/index.native.js"],"names":[],"mappings":"AASA,OAAO,KAAK,MAAM,2BAA2B,CAAA;AAE7C,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,MAAM,CAAC,OAAO,OAAO,oCAAqC,SAAQ,IAAI;IAgC7D,UAAU;IA/BjB;;;;;OAKG;IACH,WAAW,EAFD,KAAK,CAEU;IAEnB,OAAO,kBAyBZ;IAED,WAAW,wBAeV;IAEK,MAAM,kBAGX;IAEK,qBAAqB,kBAQ1B;IAED;;;;;OAKG;IACG,YAAY,CAAC,GAAG,EAJX,MAIW,EAAE,OAAO,AAH5B,CACA,EADQ,OAAO,YAAY,EAAE,YAGI,GAFvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAapE;IAED;;;;OAIG;IACG,mBAAmB,CAAC,GAAG,EAHlB,MAGkB,GAFhB,OAAO,CAAC,MAAM,CAAC,CAQ3B;CACF"}
+{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/index.native.js"],"names":[],"mappings":"AASA,OAAO,IAAI,MAAM,WAAW,CAAA;AAG5B,MAAM,CAAC,OAAO,OAAO,oCAAqC,SAAQ,IAAI;IAuB7D,UAAU;IAtBX,OAAO,kBAwBZ;IAED,WAAW,wBAeV;IAED;;;OAGG;IACH,aAAa,IAFA,MAAM,CAQlB;IAEK,MAAM,kBASX;IAEK,qBAAqB,kBAO1B;IAED;;;;;OAKG;IACG,YAAY,CAAC,GAAG,EAJX,MAIW,EAAE,OAAO,AAH5B,CACA,EADQ,OAAO,YAAY,EAAE,YAGI,GAFvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAsBpE;IAED;;;;OAIG;IACG,mBAAmB,CAAC,GAAG,EAHlB,MAGkB,GAFhB,OAAO,CAAC,MAAM,CAAC,CAmB3B;CACF"}

package/build/src/database/drivers/sqlite/index.native.js

@@ -4,24 +4,15 @@ import envSense from "env-sense/build/use-env-sense.js";
 import query from "./query";
 // @ts-expect-error
 import * as SQLite from "expo-sqlite";
-import Mutex from "epic-locks/build/mutex.js";
 import Base from "./base.js";
+import { nativeDatabaseMutex, runNativeOperation } from "./native-query-gate.js";
 export default class VelociousDatabaseDriversSqliteNative extends Base {
-    /**
-     * Serializes native queries so concurrent `getAllAsync` calls never race
-     * `expo-sqlite`'s shared `NativeStatement` objects (a single connection
-     * prepares/executes/finalizes one statement at a time).
-     * @type {Mutex}
-     */
-    _queryMutex = new Mutex();
     async connect() {
         const { isBrowser, isNative, isServer } = envSense();
         if (!isNative)
             throw new Error(`SQLite native driver running inside non-native environment: ${JSON.stringify({ isBrowser, isNative, isServer })}`);
         const args = this.getArgs();
-        if (!args.name)
-            throw new Error("No name given for SQLite Native");
-        const databaseName = args.name;
+        const databaseName = this._databaseName();
         if (args.reset) {
             try {
                 await SQLite.deleteDatabaseAsync(databaseName);
@@ -35,7 +26,9 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
                 }
             }
         }
-        this.connection = await SQLite.openDatabaseAsync(databaseName);
+        // expo-sqlite caches native databases by name. A shared cache means closing
+        // one driver's handle closes every other driver's handle for that database.
+        this.connection = await SQLite.openDatabaseAsync(databaseName, { useNewConnection: true });
         await this.registerVersion();
     }
     connectArgs() {
@@ -53,14 +46,26 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
             connectArgs["user"] = args["username"];
         return connectArgs;
     }
-    async _close() {
-        await this.connection.closeAsync();
-        this.connection = undefined;
-    }
-    async deleteDatabaseStorage() {
+    /**
+     * Returns the configured SQLite database name.
+     * @returns {string} - Database name.
+     */
+    _databaseName() {
         const databaseName = this.getArgs().name;
         if (!databaseName)
             throw new Error("No name given for SQLite Native");
+        return databaseName;
+    }
+    async _close() {
+        const databaseName = this._databaseName();
+        await nativeDatabaseMutex(databaseName).sync(async () => {
+            const connection = this.connection;
+            this.connection = undefined;
+            await connection?.closeAsync();
+        });
+    }
+    async deleteDatabaseStorage() {
+        const databaseName = this._databaseName();
         try {
             await SQLite.deleteDatabaseAsync(databaseName);
         }
@@ -76,14 +81,21 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
      * @returns {Promise<Record<string, ReturnType<typeof JSON.parse>>[]>} - Query result rows.
      */
     async _queryActual(sql, options = {}) {
-        return await this._queryMutex.sync(async () => {
-            if (!this.connection)
-                throw new Error("Not connected yet");
-            if (options.sqliteScript) {
-                await this.connection.execAsync(sql);
-                return [];
+        const databaseName = this._databaseName();
+        return await runNativeOperation({
+            databaseName,
+            getConnection: () => this.connection,
+            reopenConnection: async () => {
+                this.connection = await SQLite.openDatabaseAsync(databaseName, { useNewConnection: true });
+                return this.connection;
+            },
+            operation: async (connection) => {
+                if (options.sqliteScript) {
+                    await connection.execAsync(sql);
+                    return [];
+                }
+                return await query(connection, sql);
             }
-            return await query(this.connection, sql);
         });
     }
     /**
@@ -92,12 +104,19 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
      * @returns {Promise<number>} - Affected row count.
      */
     async _affectedRowsActual(sql) {
-        return await this._queryMutex.sync(async () => {
-            if (!this.connection)
-                throw new Error("Not connected yet");
-            const result = await this.connection.runAsync(sql);
-            return result.changes;
+        const databaseName = this._databaseName();
+        return await runNativeOperation({
+            databaseName,
+            getConnection: () => this.connection,
+            reopenConnection: async () => {
+                this.connection = await SQLite.openDatabaseAsync(databaseName, { useNewConnection: true });
+                return this.connection;
+            },
+            operation: async (connection) => {
+                const result = await connection.runAsync(sql);
+                return result.changes;
+            }
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/index.native.js"],"names":[],"mappings":"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","sourcesContent":["import {digg} from \"diggerize\"\nimport envSense from \"env-sense/build/use-env-sense.js\"\n\n// @ts-expect-error\nimport query from \"./query\"\n\n// @ts-expect-error\nimport * as SQLite from \"expo-sqlite\"\n\nimport Mutex from \"epic-locks/build/mutex.js\"\n\nimport Base from \"./base.js\"\n\nexport default class VelociousDatabaseDriversSqliteNative extends Base {\n  /**\n   * Serializes native queries so concurrent `getAllAsync` calls never race\n   * `expo-sqlite`'s shared `NativeStatement` objects (a single connection\n   * prepares/executes/finalizes one statement at a time).\n   * @type {Mutex}\n   */\n  _queryMutex = new Mutex()\n\n  async connect() {\n    const {isBrowser, isNative, isServer} = envSense()\n\n    if (!isNative) throw new Error(`SQLite native driver running inside non-native environment: ${JSON.stringify({isBrowser, isNative, isServer})}`)\n\n    const args = this.getArgs()\n\n    if (!args.name) throw new Error(\"No name given for SQLite Native\")\n\n    const databaseName = args.name\n\n    if (args.reset) {\n      try {\n        await SQLite.deleteDatabaseAsync(databaseName)\n      } catch (error) {\n        if (error instanceof Error && error.message.match(/Database '(.+)' not found/)) {\n          // Ignore not found\n        } else {\n          throw error\n        }\n      }\n    }\n\n    this.connection = await SQLite.openDatabaseAsync(databaseName)\n    await this.registerVersion()\n  }\n\n  connectArgs() {\n    const args = this.getArgs()\n    /**\n     * Connect args.\n     * @type {Record<string, ReturnType<typeof JSON.parse>>} */\n    const connectArgs = {}\n    const forward = [\"database\", \"host\", \"password\"]\n\n    for (const forwardValue of forward) {\n      if (forwardValue in args) connectArgs[forwardValue] = digg(args, forwardValue)\n    }\n\n    if (\"username\" in args) connectArgs[\"user\"] = args[\"username\"]\n\n    return connectArgs\n  }\n\n  async _close() {\n    await this.connection.closeAsync()\n    this.connection = undefined\n  }\n\n  async deleteDatabaseStorage() {\n    const databaseName = this.getArgs().name\n    if (!databaseName) throw new Error(\"No name given for SQLite Native\")\n    try {\n      await SQLite.deleteDatabaseAsync(databaseName)\n    } catch (error) {\n      if (!(error instanceof Error && error.message.match(/Database '(.+)' not found/))) throw error\n    }\n  }\n\n  /**\n   * Runs query actual.\n   * @param {string} sql - SQL string.\n   * @param {import(\"../base.js\").QueryOptions} [options] - Query options.\n   * @returns {Promise<Record<string, ReturnType<typeof JSON.parse>>[]>} - Query result rows.\n   */\n  async _queryActual(sql, options = {}) {\n    return await this._queryMutex.sync(async () => {\n      if (!this.connection) throw new Error(\"Not connected yet\")\n\n      if (options.sqliteScript) {\n        await this.connection.execAsync(sql)\n        return []\n      }\n\n      return await query(this.connection, sql)\n    })\n  }\n\n  /**\n   * Executes a mutation with affected-row metadata.\n   * @param {string} sql - Mutation SQL.\n   * @returns {Promise<number>} - Affected row count.\n   */\n  async _affectedRowsActual(sql) {\n    return await this._queryMutex.sync(async () => {\n      if (!this.connection) throw new Error(\"Not connected yet\")\n      const result = await this.connection.runAsync(sql)\n      return result.changes\n    })\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/index.native.js"],"names":[],"mappings":"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","sourcesContent":["import {digg} from \"diggerize\"\nimport envSense from \"env-sense/build/use-env-sense.js\"\n\n// @ts-expect-error\nimport query from \"./query\"\n\n// @ts-expect-error\nimport * as SQLite from \"expo-sqlite\"\n\nimport Base from \"./base.js\"\nimport {nativeDatabaseMutex, runNativeOperation} from \"./native-query-gate.js\"\n\nexport default class VelociousDatabaseDriversSqliteNative extends Base {\n  async connect() {\n    const {isBrowser, isNative, isServer} = envSense()\n\n    if (!isNative) throw new Error(`SQLite native driver running inside non-native environment: ${JSON.stringify({isBrowser, isNative, isServer})}`)\n\n    const args = this.getArgs()\n    const databaseName = this._databaseName()\n\n    if (args.reset) {\n      try {\n        await SQLite.deleteDatabaseAsync(databaseName)\n      } catch (error) {\n        if (error instanceof Error && error.message.match(/Database '(.+)' not found/)) {\n          // Ignore not found\n        } else {\n          throw error\n        }\n      }\n    }\n\n    // expo-sqlite caches native databases by name. A shared cache means closing\n    // one driver's handle closes every other driver's handle for that database.\n    this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})\n    await this.registerVersion()\n  }\n\n  connectArgs() {\n    const args = this.getArgs()\n    /**\n     * Connect args.\n     * @type {Record<string, ReturnType<typeof JSON.parse>>} */\n    const connectArgs = {}\n    const forward = [\"database\", \"host\", \"password\"]\n\n    for (const forwardValue of forward) {\n      if (forwardValue in args) connectArgs[forwardValue] = digg(args, forwardValue)\n    }\n\n    if (\"username\" in args) connectArgs[\"user\"] = args[\"username\"]\n\n    return connectArgs\n  }\n\n  /**\n   * Returns the configured SQLite database name.\n   * @returns {string} - Database name.\n   */\n  _databaseName() {\n    const databaseName = this.getArgs().name\n\n    if (!databaseName) throw new Error(\"No name given for SQLite Native\")\n\n    return databaseName\n  }\n\n  async _close() {\n    const databaseName = this._databaseName()\n\n    await nativeDatabaseMutex(databaseName).sync(async () => {\n      const connection = this.connection\n\n      this.connection = undefined\n      await connection?.closeAsync()\n    })\n  }\n\n  async deleteDatabaseStorage() {\n    const databaseName = this._databaseName()\n    try {\n      await SQLite.deleteDatabaseAsync(databaseName)\n    } catch (error) {\n      if (!(error instanceof Error && error.message.match(/Database '(.+)' not found/))) throw error\n    }\n  }\n\n  /**\n   * Runs query actual.\n   * @param {string} sql - SQL string.\n   * @param {import(\"../base.js\").QueryOptions} [options] - Query options.\n   * @returns {Promise<Record<string, ReturnType<typeof JSON.parse>>[]>} - Query result rows.\n   */\n  async _queryActual(sql, options = {}) {\n    const databaseName = this._databaseName()\n\n    return await runNativeOperation({\n      databaseName,\n      getConnection: () => this.connection,\n      reopenConnection: async () => {\n        this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})\n\n        return this.connection\n      },\n      operation: async (connection) => {\n        if (options.sqliteScript) {\n          await connection.execAsync(sql)\n          return []\n        }\n\n        return await query(connection, sql)\n      }\n    })\n  }\n\n  /**\n   * Executes a mutation with affected-row metadata.\n   * @param {string} sql - Mutation SQL.\n   * @returns {Promise<number>} - Affected row count.\n   */\n  async _affectedRowsActual(sql) {\n    const databaseName = this._databaseName()\n\n    return await runNativeOperation({\n      databaseName,\n      getConnection: () => this.connection,\n      reopenConnection: async () => {\n        this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})\n\n        return this.connection\n      },\n      operation: async (connection) => {\n        const result = await connection.runAsync(sql)\n\n        return result.changes\n      }\n    })\n  }\n}\n"]}

package/build/src/database/drivers/sqlite/native-query-gate.d.ts

@@ -0,0 +1,54 @@
+import Mutex from "epic-locks/build/mutex.js";
+export type NativeSqliteConnection = {
+    /**
+     * - Reads rows.
+     */
+    getAllAsync: (sql: string) => Promise<Array<Record<string, ReturnType<typeof JSON.parse>>>>;
+    /**
+     * - Runs a mutation.
+     */
+    runAsync: (sql: string) => Promise<{
+        changes: number;
+    }>;
+    /**
+     * - Executes a SQL script.
+     */
+    execAsync: (sql: string) => Promise<void>;
+    /**
+     * - Closes the native connection.
+     */
+    closeAsync: () => Promise<void>;
+};
+/**
+ * Returns the process-wide native query gate for one SQLite database name.
+ * expo-sqlite caches native databases by name, so a gate scoped to a driver
+ * instance is not enough: two drivers on the same database can still release
+ * each other's shared `NativeStatement` objects.
+ * @param {string} databaseName - SQLite database name.
+ * @returns {Mutex} Mutex serializing native calls for that database.
+ */
+export declare function nativeDatabaseMutex(databaseName: string): Mutex;
+/**
+ * Whether an expo-sqlite error means the native database/statement was released.
+ * @param {unknown} error - Thrown error.
+ * @returns {boolean} Whether the error is the native-handle lifetime failure.
+ */
+export declare function isNativeHandleError(error: unknown): boolean;
+/**
+ * Runs one native operation under the per-database gate, reopening once when
+ * expo-sqlite reports the shared native handle was released.
+ * @template T
+ * @param {object} args - Operation args.
+ * @param {string} args.databaseName - SQLite database name.
+ * @param {() => NativeSqliteConnection | undefined} args.getConnection - Current connection getter.
+ * @param {() => Promise<NativeSqliteConnection>} args.reopenConnection - Opens a fresh native connection.
+ * @param {(connection: NativeSqliteConnection) => Promise<T>} args.operation - Operation to run.
+ * @returns {Promise<T>} Operation result.
+ */
+export declare function runNativeOperation<T>({ databaseName, getConnection, reopenConnection, operation }: {
+    databaseName: string;
+    getConnection: () => NativeSqliteConnection | undefined;
+    reopenConnection: () => Promise<NativeSqliteConnection>;
+    operation: (connection: NativeSqliteConnection) => Promise<T>;
+}): Promise<T>;
+//# sourceMappingURL=native-query-gate.d.ts.map

package/build/src/database/drivers/sqlite/native-query-gate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"native-query-gate.d.ts","sourceRoot":"","sources":["../../../../../src/database/drivers/sqlite/native-query-gate.js"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,2BAA2B,CAAA;AAG1C,YAAkB,sBAAsB,GACxC;;;;IAA2F,WAAW,EAA3F,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACzF;;;;IAAwD,QAAQ,EAArD,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC,CACtD;;;;IAA2C,SAAS,EAAzC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CACzC;;;;IAAgC,UAAU,EAA/B,MAAM,OAAO,CAAC,IAAI,CAAC,CAChC;CAAA,CAAA;AAKD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAHrC,MAGqC,GAFnC,KAAK,CAWjB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAH9B,OAG8B,GAF5B,OAAO,CAQnB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,kBAAkB,CAR3B,CAAC,EAQ2B,EAAC,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,SAAS,EAAC,EANhG;IAAqB,YAAY,EAAzB,MAAM,CACd;IAAuD,aAAa,EAA5D,MAAM,sBAAsB,GAAG,SAAS,CAChD;IAAoD,gBAAgB,EAA5D,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAC7C;IAAiE,SAAS,EAAlE,CAAC,UAAU,EAAE,sBAAsB,KAAK,OAAO,CAAC,CAAC,CAAC,CAC1D;CAEgG,GAFtF,OAAO,CAAC,CAAC,CAAC,CAgBtB"}

package/build/src/database/drivers/sqlite/native-query-gate.js

@@ -0,0 +1,65 @@
+// @ts-check
+import Mutex from "epic-locks/build/mutex.js";
+/**
+ * @typedef {object} NativeSqliteConnection
+ * @property {(sql: string) => Promise<Array<Record<string, ReturnType<typeof JSON.parse>>>>} getAllAsync - Reads rows.
+ * @property {(sql: string) => Promise<{changes: number}>} runAsync - Runs a mutation.
+ * @property {(sql: string) => Promise<void>} execAsync - Executes a SQL script.
+ * @property {() => Promise<void>} closeAsync - Closes the native connection.
+ */
+/** @type {Map<string, Mutex>} */
+const mutexesByDatabaseName = new Map();
+/**
+ * Returns the process-wide native query gate for one SQLite database name.
+ * expo-sqlite caches native databases by name, so a gate scoped to a driver
+ * instance is not enough: two drivers on the same database can still release
+ * each other's shared `NativeStatement` objects.
+ * @param {string} databaseName - SQLite database name.
+ * @returns {Mutex} Mutex serializing native calls for that database.
+ */
+export function nativeDatabaseMutex(databaseName) {
+    let mutex = mutexesByDatabaseName.get(databaseName);
+    if (!mutex) {
+        mutex = new Mutex();
+        mutexesByDatabaseName.set(databaseName, mutex);
+    }
+    return mutex;
+}
+/**
+ * Whether an expo-sqlite error means the native database/statement was released.
+ * @param {unknown} error - Thrown error.
+ * @returns {boolean} Whether the error is the native-handle lifetime failure.
+ */
+export function isNativeHandleError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const causeMessage = error instanceof Error && error.cause instanceof Error ? error.cause.message : "";
+    const text = `${message} ${causeMessage}`;
+    return /NativeStatement\.runAsync|NativeDatabase\.prepareAsync/.test(text) && /NullPointerException|already released/.test(text);
+}
+/**
+ * Runs one native operation under the per-database gate, reopening once when
+ * expo-sqlite reports the shared native handle was released.
+ * @template T
+ * @param {object} args - Operation args.
+ * @param {string} args.databaseName - SQLite database name.
+ * @param {() => NativeSqliteConnection | undefined} args.getConnection - Current connection getter.
+ * @param {() => Promise<NativeSqliteConnection>} args.reopenConnection - Opens a fresh native connection.
+ * @param {(connection: NativeSqliteConnection) => Promise<T>} args.operation - Operation to run.
+ * @returns {Promise<T>} Operation result.
+ */
+export async function runNativeOperation({ databaseName, getConnection, reopenConnection, operation }) {
+    return await nativeDatabaseMutex(databaseName).sync(async () => {
+        const connection = getConnection();
+        if (!connection)
+            throw new Error("Not connected yet");
+        try {
+            return await operation(connection);
+        }
+        catch (error) {
+            if (!isNativeHandleError(error))
+                throw error;
+            return await operation(await reopenConnection());
+        }
+    });
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF0aXZlLXF1ZXJ5LWdhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvZGF0YWJhc2UvZHJpdmVycy9zcWxpdGUvbmF0aXZlLXF1ZXJ5LWdhdGUuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWTtBQUVaLE9BQU8sS0FBSyxNQUFNLDJCQUEyQixDQUFBO0FBRTdDOzs7Ozs7R0FNRztBQUVILGlDQUFpQztBQUNqQyxNQUFNLHFCQUFxQixHQUFHLElBQUksR0FBRyxFQUFFLENBQUE7QUFFdkM7Ozs7Ozs7R0FPRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FBQyxZQUFZO0lBQzlDLElBQUksS0FBSyxHQUFHLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUVuRCxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDWCxLQUFLLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQTtRQUNuQixxQkFBcUIsQ0FBQyxHQUFHLENBQUMsWUFBWSxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ2hELENBQUM7SUFFRCxPQUFPLEtBQUssQ0FBQTtBQUNkLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQUFDLEtBQUs7SUFDdkMsTUFBTSxPQUFPLEdBQUcsS0FBSyxZQUFZLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ3RFLE1BQU0sWUFBWSxHQUFHLEtBQUssWUFBWSxLQUFLLElBQUksS0FBSyxDQUFDLEtBQUssWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDdEcsTUFBTSxJQUFJLEdBQUcsR0FBRyxPQUFPLElBQUksWUFBWSxFQUFFLENBQUE7SUFFekMsT0FBTyx3REFBd0QsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksdUNBQXVDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO0FBQ2xJLENBQUM7QUFFRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxrQkFBa0IsQ0FBQyxFQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsU0FBUyxFQUFDO0lBQ2pHLE9BQU8sTUFBTSxtQkFBbUIsQ0FBQyxZQUFZLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUU7UUFDN0QsTUFBTSxVQUFVLEdBQUcsYUFBYSxFQUFFLENBQUE7UUFFbEMsSUFBSSxDQUFDLFVBQVU7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUE7UUFFckQsSUFBSSxDQUFDO1lBQ0gsT0FBTyxNQUFNLFNBQVMsQ0FBQyxVQUFVLENBQUMsQ0FBQTtRQUNwQyxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLENBQUM7Z0JBQUUsTUFBTSxLQUFLLENBQUE7WUFFNUMsT0FBTyxNQUFNLFNBQVMsQ0FBQyxNQUFNLGdCQUFnQixFQUFFLENBQUMsQ0FBQTtRQUNsRCxDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQHRzLWNoZWNrXG5cbmltcG9ydCBNdXRleCBmcm9tIFwiZXBpYy1sb2Nrcy9idWlsZC9tdXRleC5qc1wiXG5cbi8qKlxuICogQHR5cGVkZWYge29iamVjdH0gTmF0aXZlU3FsaXRlQ29ubmVjdGlvblxuICogQHByb3BlcnR5IHsoc3FsOiBzdHJpbmcpID0+IFByb21pc2U8QXJyYXk8UmVjb3JkPHN0cmluZywgUmV0dXJuVHlwZTx0eXBlb2YgSlNPTi5wYXJzZT4+Pj59IGdldEFsbEFzeW5jIC0gUmVhZHMgcm93cy5cbiAqIEBwcm9wZXJ0eSB7KHNxbDogc3RyaW5nKSA9PiBQcm9taXNlPHtjaGFuZ2VzOiBudW1iZXJ9Pn0gcnVuQXN5bmMgLSBSdW5zIGEgbXV0YXRpb24uXG4gKiBAcHJvcGVydHkgeyhzcWw6IHN0cmluZykgPT4gUHJvbWlzZTx2b2lkPn0gZXhlY0FzeW5jIC0gRXhlY3V0ZXMgYSBTUUwgc2NyaXB0LlxuICogQHByb3BlcnR5IHsoKSA9PiBQcm9taXNlPHZvaWQ+fSBjbG9zZUFzeW5jIC0gQ2xvc2VzIHRoZSBuYXRpdmUgY29ubmVjdGlvbi5cbiAqL1xuXG4vKiogQHR5cGUge01hcDxzdHJpbmcsIE11dGV4Pn0gKi9cbmNvbnN0IG11dGV4ZXNCeURhdGFiYXNlTmFtZSA9IG5ldyBNYXAoKVxuXG4vKipcbiAqIFJldHVybnMgdGhlIHByb2Nlc3Mtd2lkZSBuYXRpdmUgcXVlcnkgZ2F0ZSBmb3Igb25lIFNRTGl0ZSBkYXRhYmFzZSBuYW1lLlxuICogZXhwby1zcWxpdGUgY2FjaGVzIG5hdGl2ZSBkYXRhYmFzZXMgYnkgbmFtZSwgc28gYSBnYXRlIHNjb3BlZCB0byBhIGRyaXZlclxuICogaW5zdGFuY2UgaXMgbm90IGVub3VnaDogdHdvIGRyaXZlcnMgb24gdGhlIHNhbWUgZGF0YWJhc2UgY2FuIHN0aWxsIHJlbGVhc2VcbiAqIGVhY2ggb3RoZXIncyBzaGFyZWQgYE5hdGl2ZVN0YXRlbWVudGAgb2JqZWN0cy5cbiAqIEBwYXJhbSB7c3RyaW5nfSBkYXRhYmFzZU5hbWUgLSBTUUxpdGUgZGF0YWJhc2UgbmFtZS5cbiAqIEByZXR1cm5zIHtNdXRleH0gTXV0ZXggc2VyaWFsaXppbmcgbmF0aXZlIGNhbGxzIGZvciB0aGF0IGRhdGFiYXNlLlxuICovXG5leHBvcnQgZnVuY3Rpb24gbmF0aXZlRGF0YWJhc2VNdXRleChkYXRhYmFzZU5hbWUpIHtcbiAgbGV0IG11dGV4ID0gbXV0ZXhlc0J5RGF0YWJhc2VOYW1lLmdldChkYXRhYmFzZU5hbWUpXG5cbiAgaWYgKCFtdXRleCkge1xuICAgIG11dGV4ID0gbmV3IE11dGV4KClcbiAgICBtdXRleGVzQnlEYXRhYmFzZU5hbWUuc2V0KGRhdGFiYXNlTmFtZSwgbXV0ZXgpXG4gIH1cblxuICByZXR1cm4gbXV0ZXhcbn1cblxuLyoqXG4gKiBXaGV0aGVyIGFuIGV4cG8tc3FsaXRlIGVycm9yIG1lYW5zIHRoZSBuYXRpdmUgZGF0YWJhc2Uvc3RhdGVtZW50IHdhcyByZWxlYXNlZC5cbiAqIEBwYXJhbSB7dW5rbm93bn0gZXJyb3IgLSBUaHJvd24gZXJyb3IuXG4gKiBAcmV0dXJucyB7Ym9vbGVhbn0gV2hldGhlciB0aGUgZXJyb3IgaXMgdGhlIG5hdGl2ZS1oYW5kbGUgbGlmZXRpbWUgZmFpbHVyZS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGlzTmF0aXZlSGFuZGxlRXJyb3IoZXJyb3IpIHtcbiAgY29uc3QgbWVzc2FnZSA9IGVycm9yIGluc3RhbmNlb2YgRXJyb3IgPyBlcnJvci5tZXNzYWdlIDogU3RyaW5nKGVycm9yKVxuICBjb25zdCBjYXVzZU1lc3NhZ2UgPSBlcnJvciBpbnN0YW5jZW9mIEVycm9yICYmIGVycm9yLmNhdXNlIGluc3RhbmNlb2YgRXJyb3IgPyBlcnJvci5jYXVzZS5tZXNzYWdlIDogXCJcIlxuICBjb25zdCB0ZXh0ID0gYCR7bWVzc2FnZX0gJHtjYXVzZU1lc3NhZ2V9YFxuXG4gIHJldHVybiAvTmF0aXZlU3RhdGVtZW50XFwucnVuQXN5bmN8TmF0aXZlRGF0YWJhc2VcXC5wcmVwYXJlQXN5bmMvLnRlc3QodGV4dCkgJiYgL051bGxQb2ludGVyRXhjZXB0aW9ufGFscmVhZHkgcmVsZWFzZWQvLnRlc3QodGV4dClcbn1cblxuLyoqXG4gKiBSdW5zIG9uZSBuYXRpdmUgb3BlcmF0aW9uIHVuZGVyIHRoZSBwZXItZGF0YWJhc2UgZ2F0ZSwgcmVvcGVuaW5nIG9uY2Ugd2hlblxuICogZXhwby1zcWxpdGUgcmVwb3J0cyB0aGUgc2hhcmVkIG5hdGl2ZSBoYW5kbGUgd2FzIHJlbGVhc2VkLlxuICogQHRlbXBsYXRlIFRcbiAqIEBwYXJhbSB7b2JqZWN0fSBhcmdzIC0gT3BlcmF0aW9uIGFyZ3MuXG4gKiBAcGFyYW0ge3N0cmluZ30gYXJncy5kYXRhYmFzZU5hbWUgLSBTUUxpdGUgZGF0YWJhc2UgbmFtZS5cbiAqIEBwYXJhbSB7KCkgPT4gTmF0aXZlU3FsaXRlQ29ubmVjdGlvbiB8IHVuZGVmaW5lZH0gYXJncy5nZXRDb25uZWN0aW9uIC0gQ3VycmVudCBjb25uZWN0aW9uIGdldHRlci5cbiAqIEBwYXJhbSB7KCkgPT4gUHJvbWlzZTxOYXRpdmVTcWxpdGVDb25uZWN0aW9uPn0gYXJncy5yZW9wZW5Db25uZWN0aW9uIC0gT3BlbnMgYSBmcmVzaCBuYXRpdmUgY29ubmVjdGlvbi5cbiAqIEBwYXJhbSB7KGNvbm5lY3Rpb246IE5hdGl2ZVNxbGl0ZUNvbm5lY3Rpb24pID0+IFByb21pc2U8VD59IGFyZ3Mub3BlcmF0aW9uIC0gT3BlcmF0aW9uIHRvIHJ1bi5cbiAqIEByZXR1cm5zIHtQcm9taXNlPFQ+fSBPcGVyYXRpb24gcmVzdWx0LlxuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gcnVuTmF0aXZlT3BlcmF0aW9uKHtkYXRhYmFzZU5hbWUsIGdldENvbm5lY3Rpb24sIHJlb3BlbkNvbm5lY3Rpb24sIG9wZXJhdGlvbn0pIHtcbiAgcmV0dXJuIGF3YWl0IG5hdGl2ZURhdGFiYXNlTXV0ZXgoZGF0YWJhc2VOYW1lKS5zeW5jKGFzeW5jICgpID0+IHtcbiAgICBjb25zdCBjb25uZWN0aW9uID0gZ2V0Q29ubmVjdGlvbigpXG5cbiAgICBpZiAoIWNvbm5lY3Rpb24pIHRocm93IG5ldyBFcnJvcihcIk5vdCBjb25uZWN0ZWQgeWV0XCIpXG5cbiAgICB0cnkge1xuICAgICAgcmV0dXJuIGF3YWl0IG9wZXJhdGlvbihjb25uZWN0aW9uKVxuICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICBpZiAoIWlzTmF0aXZlSGFuZGxlRXJyb3IoZXJyb3IpKSB0aHJvdyBlcnJvclxuXG4gICAgICByZXR1cm4gYXdhaXQgb3BlcmF0aW9uKGF3YWl0IHJlb3BlbkNvbm5lY3Rpb24oKSlcbiAgICB9XG4gIH0pXG59XG4iXX0=

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "build/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.706",
+  "version": "1.0.707",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

package/src/database/drivers/sqlite/index.native.js

@@ -7,29 +7,17 @@ import query from "./query"
 // @ts-expect-error
 import * as SQLite from "expo-sqlite"
 
-import Mutex from "epic-locks/build/mutex.js"
-
 import Base from "./base.js"
+import {nativeDatabaseMutex, runNativeOperation} from "./native-query-gate.js"
 
 export default class VelociousDatabaseDriversSqliteNative extends Base {
-  /**
-   * Serializes native queries so concurrent `getAllAsync` calls never race
-   * `expo-sqlite`'s shared `NativeStatement` objects (a single connection
-   * prepares/executes/finalizes one statement at a time).
-   * @type {Mutex}
-   */
-  _queryMutex = new Mutex()
-
   async connect() {
     const {isBrowser, isNative, isServer} = envSense()
 
     if (!isNative) throw new Error(`SQLite native driver running inside non-native environment: ${JSON.stringify({isBrowser, isNative, isServer})}`)
 
     const args = this.getArgs()
-
-    if (!args.name) throw new Error("No name given for SQLite Native")
-
-    const databaseName = args.name
+    const databaseName = this._databaseName()
 
     if (args.reset) {
       try {
@@ -43,7 +31,9 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
       }
     }
 
-    this.connection = await SQLite.openDatabaseAsync(databaseName)
+    // expo-sqlite caches native databases by name. A shared cache means closing
+    // one driver's handle closes every other driver's handle for that database.
+    this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})
     await this.registerVersion()
   }
 
@@ -64,14 +54,31 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
     return connectArgs
   }
 
+  /**
+   * Returns the configured SQLite database name.
+   * @returns {string} - Database name.
+   */
+  _databaseName() {
+    const databaseName = this.getArgs().name
+
+    if (!databaseName) throw new Error("No name given for SQLite Native")
+
+    return databaseName
+  }
+
   async _close() {
-    await this.connection.closeAsync()
-    this.connection = undefined
+    const databaseName = this._databaseName()
+
+    await nativeDatabaseMutex(databaseName).sync(async () => {
+      const connection = this.connection
+
+      this.connection = undefined
+      await connection?.closeAsync()
+    })
   }
 
   async deleteDatabaseStorage() {
-    const databaseName = this.getArgs().name
-    if (!databaseName) throw new Error("No name given for SQLite Native")
+    const databaseName = this._databaseName()
     try {
       await SQLite.deleteDatabaseAsync(databaseName)
     } catch (error) {
@@ -86,15 +93,24 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
    * @returns {Promise<Record<string, ReturnType<typeof JSON.parse>>[]>} - Query result rows.
    */
   async _queryActual(sql, options = {}) {
-    return await this._queryMutex.sync(async () => {
-      if (!this.connection) throw new Error("Not connected yet")
+    const databaseName = this._databaseName()
+
+    return await runNativeOperation({
+      databaseName,
+      getConnection: () => this.connection,
+      reopenConnection: async () => {
+        this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})
+
+        return this.connection
+      },
+      operation: async (connection) => {
+        if (options.sqliteScript) {
+          await connection.execAsync(sql)
+          return []
+        }
 
-      if (options.sqliteScript) {
-        await this.connection.execAsync(sql)
-        return []
+        return await query(connection, sql)
       }
-
-      return await query(this.connection, sql)
     })
   }
 
@@ -104,10 +120,21 @@ export default class VelociousDatabaseDriversSqliteNative extends Base {
    * @returns {Promise<number>} - Affected row count.
    */
   async _affectedRowsActual(sql) {
-    return await this._queryMutex.sync(async () => {
-      if (!this.connection) throw new Error("Not connected yet")
-      const result = await this.connection.runAsync(sql)
-      return result.changes
+    const databaseName = this._databaseName()
+
+    return await runNativeOperation({
+      databaseName,
+      getConnection: () => this.connection,
+      reopenConnection: async () => {
+        this.connection = await SQLite.openDatabaseAsync(databaseName, {useNewConnection: true})
+
+        return this.connection
+      },
+      operation: async (connection) => {
+        const result = await connection.runAsync(sql)
+
+        return result.changes
+      }
     })
   }
 }

package/src/database/drivers/sqlite/native-query-gate.js

@@ -0,0 +1,73 @@
+// @ts-check
+
+import Mutex from "epic-locks/build/mutex.js"
+
+/**
+ * @typedef {object} NativeSqliteConnection
+ * @property {(sql: string) => Promise<Array<Record<string, ReturnType<typeof JSON.parse>>>>} getAllAsync - Reads rows.
+ * @property {(sql: string) => Promise<{changes: number}>} runAsync - Runs a mutation.
+ * @property {(sql: string) => Promise<void>} execAsync - Executes a SQL script.
+ * @property {() => Promise<void>} closeAsync - Closes the native connection.
+ */
+
+/** @type {Map<string, Mutex>} */
+const mutexesByDatabaseName = new Map()
+
+/**
+ * Returns the process-wide native query gate for one SQLite database name.
+ * expo-sqlite caches native databases by name, so a gate scoped to a driver
+ * instance is not enough: two drivers on the same database can still release
+ * each other's shared `NativeStatement` objects.
+ * @param {string} databaseName - SQLite database name.
+ * @returns {Mutex} Mutex serializing native calls for that database.
+ */
+export function nativeDatabaseMutex(databaseName) {
+  let mutex = mutexesByDatabaseName.get(databaseName)
+
+  if (!mutex) {
+    mutex = new Mutex()
+    mutexesByDatabaseName.set(databaseName, mutex)
+  }
+
+  return mutex
+}
+
+/**
+ * Whether an expo-sqlite error means the native database/statement was released.
+ * @param {unknown} error - Thrown error.
+ * @returns {boolean} Whether the error is the native-handle lifetime failure.
+ */
+export function isNativeHandleError(error) {
+  const message = error instanceof Error ? error.message : String(error)
+  const causeMessage = error instanceof Error && error.cause instanceof Error ? error.cause.message : ""
+  const text = `${message} ${causeMessage}`
+
+  return /NativeStatement\.runAsync|NativeDatabase\.prepareAsync/.test(text) && /NullPointerException|already released/.test(text)
+}
+
+/**
+ * Runs one native operation under the per-database gate, reopening once when
+ * expo-sqlite reports the shared native handle was released.
+ * @template T
+ * @param {object} args - Operation args.
+ * @param {string} args.databaseName - SQLite database name.
+ * @param {() => NativeSqliteConnection | undefined} args.getConnection - Current connection getter.
+ * @param {() => Promise<NativeSqliteConnection>} args.reopenConnection - Opens a fresh native connection.
+ * @param {(connection: NativeSqliteConnection) => Promise<T>} args.operation - Operation to run.
+ * @returns {Promise<T>} Operation result.
+ */
+export async function runNativeOperation({databaseName, getConnection, reopenConnection, operation}) {
+  return await nativeDatabaseMutex(databaseName).sync(async () => {
+    const connection = getConnection()
+
+    if (!connection) throw new Error("Not connected yet")
+
+    try {
+      return await operation(connection)
+    } catch (error) {
+      if (!isNativeHandleError(error)) throw error
+
+      return await operation(await reopenConnection())
+    }
+  })
+}