npm - expo-sqlite - Versions diffs - 58.0.7 → 58.0.9 - Mend

expo-sqlite 58.0.7 → 58.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (62) hide show

package/dev-plugin-dist/_sitemap.html CHANGED Viewed

@@ -314,5 +314,5 @@ input::-webkit-search-cancel-button,input::-webkit-search-decoration,input::-web
 @keyframes r-imtty0{0%{opacity:0;}100%{opacity:1;}}
 @keyframes r-q67da2{0%{transform:translateX(-100%);}100%{transform:translateX(400%);}}
 @keyframes r-t2lo5v{0%{opacity:1;}100%{opacity:0;}}</style><script type="module">globalThis.__EXPO_ROUTER_HYDRATE__=true;</script><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css" as="style">
-<link rel="stylesheet" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css"></head><body><div id="root"><div class="css-g5y9jx r-13awgt0"></div></div><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-171413bc9bf8452e491f0d7713017a36.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-725582fc6bba7ccfc743bb9aba24f9bc.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-46e748b71acc826f94c91796cdf4bc28.js" defer></script>
+<link rel="stylesheet" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css"></head><body><div id="root"><div class="css-g5y9jx r-13awgt0"></div></div><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-b2894030c1dfbd95b717a85901b6c271.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-9b94dd2fbdbb825a662f42cf8d2077ee.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-04fdb7d857a65c0ed638ef2d774a4b6e.js" defer></script>
 </body></html>

package/dev-plugin-dist/index.html CHANGED Viewed

@@ -314,5 +314,5 @@ input::-webkit-search-cancel-button,input::-webkit-search-decoration,input::-web
 @keyframes r-imtty0{0%{opacity:0;}100%{opacity:1;}}
 @keyframes r-q67da2{0%{transform:translateX(-100%);}100%{transform:translateX(400%);}}
 @keyframes r-t2lo5v{0%{opacity:1;}100%{opacity:0;}}</style><script type="module">globalThis.__EXPO_ROUTER_HYDRATE__=true;</script><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css" as="style">
-<link rel="stylesheet" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css"></head><body><div id="root"><div class="css-g5y9jx r-13awgt0"><!--$--><!--$--><div class="flex min-h-screen items-center justify-center bg-linear-to-br from-slate-50 to-slate-100 p-4"><div class="rounded-xl border bg-card text-card-foreground shadow w-full max-w-2xl"><div class="flex flex-col space-y-1.5 p-6 text-center"><div class="font-semibold tracking-tight text-3xl">SQLite Database Inspector</div><div class="text-muted-foreground text-base">Upload a database file or connect to your app</div></div><div class="p-6 pt-0"><div dir="ltr" data-orientation="horizontal" class="w-full"><div role="tablist" aria-orientation="horizontal" class="h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground grid w-full grid-cols-2" tabindex="-1" data-orientation="horizontal" style="outline:none"><button type="button" role="tab" aria-selected="true" aria-controls="radix-_R_jer3_-content-devtools" data-state="active" data-disabled="" disabled="" id="radix-_R_jer3_-trigger-devtools" class="inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow" tabindex="-1" data-orientation="horizontal" data-radix-collection-item="">From App </button><button type="button" role="tab" aria-selected="false" aria-controls="radix-_R_jer3_-content-upload" data-state="inactive" id="radix-_R_jer3_-trigger-upload" class="inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow" tabindex="-1" data-orientation="horizontal" data-radix-collection-item="">Upload File</button></div><div data-state="inactive" data-orientation="horizontal" role="tabpanel" aria-labelledby="radix-_R_jer3_-trigger-upload" hidden="" id="radix-_R_jer3_-content-upload" tabindex="0" class="mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"></div><div data-state="active" data-orientation="horizontal" role="tabpanel" aria-labelledby="radix-_R_jer3_-trigger-devtools" id="radix-_R_jer3_-content-devtools" tabindex="0" class="mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2" style="animation-duration:0s"><div class="space-y-4"><div class="flex items-center justify-between"><h3 class="text-sm font-medium">Available Databases</h3><button class="inline-flex items-center justify-center gap-2 whitespace-nowrap font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&amp;_svg]:pointer-events-none [&amp;_svg]:size-4 [&amp;_svg]:shrink-0 border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground h-8 rounded-md px-3 text-xs"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-refresh-cw h-4 w-4 mr-2" aria-hidden="true"><path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8"></path><path d="M21 3v5h-5"></path><path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16"></path><path d="M8 16H3v5"></path></svg>Refresh</button></div><div class="text-center p-12 rounded-lg border-2 border-dashed border-muted-foreground/25"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-database h-12 w-12 text-muted-foreground mx-auto mb-4" aria-hidden="true"><ellipse cx="12" cy="5" rx="9" ry="3"></ellipse><path d="M3 5V19A9 3 0 0 0 21 19V5"></path><path d="M3 12A9 3 0 0 0 21 12"></path></svg><p class="text-sm text-muted-foreground">No databases found. Make sure your app is using useSQLiteDevTool.</p></div></div></div></div></div></div></div><section aria-label="Notifications alt+T" tabindex="-1" aria-live="polite" aria-relevant="additions text" aria-atomic="false"></section><!--/$--><!--/$--></div></div><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-171413bc9bf8452e491f0d7713017a36.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/index-42fa8946372d43a04e2a3d5f7c907da9.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-725582fc6bba7ccfc743bb9aba24f9bc.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-46e748b71acc826f94c91796cdf4bc28.js" defer></script>
+<link rel="stylesheet" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css"></head><body><div id="root"><div class="css-g5y9jx r-13awgt0"><!--$--><!--$--><div class="flex min-h-screen items-center justify-center bg-linear-to-br from-slate-50 to-slate-100 p-4"><div class="rounded-xl border bg-card text-card-foreground shadow w-full max-w-2xl"><div class="flex flex-col space-y-1.5 p-6 text-center"><div class="font-semibold tracking-tight text-3xl">SQLite Database Inspector</div><div class="text-muted-foreground text-base">Upload a database file or connect to your app</div></div><div class="p-6 pt-0"><div dir="ltr" data-orientation="horizontal" class="w-full"><div role="tablist" aria-orientation="horizontal" class="h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground grid w-full grid-cols-2" tabindex="-1" data-orientation="horizontal" style="outline:none"><button type="button" role="tab" aria-selected="true" aria-controls="radix-_R_jer3_-content-devtools" data-state="active" data-disabled="" disabled="" id="radix-_R_jer3_-trigger-devtools" class="inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow" tabindex="-1" data-orientation="horizontal" data-radix-collection-item="">From App </button><button type="button" role="tab" aria-selected="false" aria-controls="radix-_R_jer3_-content-upload" data-state="inactive" id="radix-_R_jer3_-trigger-upload" class="inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow" tabindex="-1" data-orientation="horizontal" data-radix-collection-item="">Upload File</button></div><div data-state="inactive" data-orientation="horizontal" role="tabpanel" aria-labelledby="radix-_R_jer3_-trigger-upload" hidden="" id="radix-_R_jer3_-content-upload" tabindex="0" class="mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"></div><div data-state="active" data-orientation="horizontal" role="tabpanel" aria-labelledby="radix-_R_jer3_-trigger-devtools" id="radix-_R_jer3_-content-devtools" tabindex="0" class="mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2" style="animation-duration:0s"><div class="space-y-4"><div class="flex items-center justify-between"><h3 class="text-sm font-medium">Available Databases</h3><button class="inline-flex items-center justify-center gap-2 whitespace-nowrap font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&amp;_svg]:pointer-events-none [&amp;_svg]:size-4 [&amp;_svg]:shrink-0 border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground h-8 rounded-md px-3 text-xs"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-refresh-cw h-4 w-4 mr-2" aria-hidden="true"><path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8"></path><path d="M21 3v5h-5"></path><path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16"></path><path d="M8 16H3v5"></path></svg>Refresh</button></div><div class="text-center p-12 rounded-lg border-2 border-dashed border-muted-foreground/25"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-database h-12 w-12 text-muted-foreground mx-auto mb-4" aria-hidden="true"><ellipse cx="12" cy="5" rx="9" ry="3"></ellipse><path d="M3 5V19A9 3 0 0 0 21 19V5"></path><path d="M3 12A9 3 0 0 0 21 12"></path></svg><p class="text-sm text-muted-foreground">No databases found. Make sure your app is using useSQLiteDevTool.</p></div></div></div></div></div></div></div><section aria-label="Notifications alt+T" tabindex="-1" aria-live="polite" aria-relevant="additions text" aria-atomic="false"></section><!--/$--><!--/$--></div></div><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-b2894030c1dfbd95b717a85901b6c271.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/index-4bf2da199f699eb47a42074d5e183c07.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-9b94dd2fbdbb825a662f42cf8d2077ee.js" defer></script><script src="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-04fdb7d857a65c0ed638ef2d774a4b6e.js" defer></script>
 </body></html>

package/ios/NativeDatabase.swift CHANGED Viewed

@@ -11,6 +11,10 @@ final class NativeDatabase: SharedObject, @unchecked Sendable {
   let openOptions: OpenDatabaseOptions
   var isClosed = false
   let closeLock = NSLock()
+  // Protect statement registration and cleanup through the final close attempt.
+  // Running statements use their own locks, so interruption need not wait for them.
+  let statementLifecycleLock = NSRecursiveLock()
+  var statements: [NativeStatement] = []
   var extraPointer: OpaquePointer?
   private var refCount = AtomicInteger(1)
@@ -134,11 +138,16 @@ final class NativeDatabase: SharedObject, @unchecked Sendable {
   }
   private func prepare(statement: NativeStatement, source: String) throws {
-    try ensureOpen()
-    try statement.ensureNotFinalized()
-    let sourceString = source.cString(using: .utf8)
-    if exsqlite3_prepare_v2(pointer, sourceString, -1, &statement.pointer, nil) != SQLITE_OK {
-      throw SQLiteErrorException(lastErrorMessage())
+    statementLifecycleLock.lock()
+    defer { statementLifecycleLock.unlock() }
+    try statement.lock.withLock { _ in
+      try statement.ensureNotFinalized()
+      try ensureOpen()
+      let sourceString = source.cString(using: .utf8)
+      if exsqlite3_prepare_v2(pointer, sourceString, -1, &statement.pointer, nil) != SQLITE_OK {
+        throw SQLiteErrorException(lastErrorMessage())
+      }
+      statements.append(statement)
     }
   }

package/ios/NativeStatement.swift CHANGED Viewed

@@ -60,10 +60,10 @@ final class NativeStatement: SharedObject, @unchecked Sendable {
   // MARK: - Implementation shared by the sync and async members
   private func reset(database: NativeDatabase) throws {
-    try database.ensureOpen()
-    try ensureNotFinalized()
     try lock.withLock { _ in
+      try ensureNotFinalized()
+      try database.ensureOpen()
       if exsqlite3_reset(pointer) != SQLITE_OK {
         throw SQLiteErrorException(database.lastErrorMessage())
       }
@@ -71,24 +71,32 @@ final class NativeStatement: SharedObject, @unchecked Sendable {
   }
   private func getColumnNames() throws -> [String] {
-    try ensureNotFinalized()
-    let columnCount = Int(exsqlite3_column_count(pointer))
-    var columnNames: [String] = Array(repeating: "", count: columnCount)
-    for i in 0..<columnCount {
-      columnNames[i] = String(cString: exsqlite3_column_name(pointer, Int32(i)))
+    return try lock.withLock { _ in
+      try ensureNotFinalized()
+      let columnCount = Int(exsqlite3_column_count(pointer))
+      var columnNames: [String] = Array(repeating: "", count: columnCount)
+      for i in 0..<columnCount {
+        columnNames[i] = String(cString: exsqlite3_column_name(pointer, Int32(i)))
+      }
+      return columnNames
     }
-    return columnNames
   }
-  private func finalize(database: NativeDatabase) throws {
-    try database.ensureOpen()
-    try ensureNotFinalized()
+  func finalize(database: NativeDatabase) throws {
+    database.statementLifecycleLock.lock()
+    defer { database.statementLifecycleLock.unlock() }
     try lock.withLock { _ in
-      if exsqlite3_finalize(pointer) != SQLITE_OK {
+      try ensureNotFinalized()
+      try database.ensureOpen()
+      let ret = exsqlite3_finalize(pointer)
+      // SQLite destroys the statement even when returning an earlier execution error.
+      isFinalized = true
+      pointer = nil
+      database.statements.removeAll { $0 === self }
+      if ret != SQLITE_OK {
         throw SQLiteErrorException(database.lastErrorMessage())
       }
-      isFinalized = true
     }
   }
 }

package/ios/SQLiteModule.swift CHANGED Viewed

@@ -9,7 +9,7 @@ private let MEMORY_DB_NAME = ":memory:"
 private let moduleQueue = DispatchQueue(label: "expo.module.sqlite.AsyncQueue", qos: .userInitiated, attributes: .concurrent)
 // `@unchecked Sendable`: the `@JS(.concurrent)` members send the module off the JavaScript thread, which
-// Swift 6 mode allows only for a `Sendable` module. The mutable state is either guarded by `lockQueue` or
+// Swift 6 mode allows only for a `Sendable` module. The mutable state is either guarded by `cacheLock` or
 // only read off the JavaScript thread (`hasListeners`).
 @ExpoModule("ExpoSQLite")
 public final class SQLiteModule: Module, @unchecked Sendable {
@@ -17,7 +17,8 @@ public final class SQLiteModule: Module, @unchecked Sendable {
   // will release the pair when `closeDatabase` is called.
   private var contextPairs = [Unmanaged<AnyObject>]()
-  private static let lockQueue = DispatchQueue(label: "expo.modules.sqlite.lockQueue")
+  // Closing a cached connection also releases its update-hook context under this lock.
+  private static let cacheLock = NSRecursiveLock()
   private var cachedDatabases = [NativeDatabase]()
   private(set) var hasListeners = false
@@ -154,10 +155,7 @@ public final class SQLiteModule: Module, @unchecked Sendable {
       }
       AsyncFunction("closeAsync") { (database: NativeDatabase) in
-        try maybeThrowForClosedDatabase(database)
-        if let db = removeCachedDatabase(of: database) {
-          try closeDatabase(db)
-        }
+        try closeDatabaseIfNeeded(database)
       }.runOnQueue(moduleQueue)
       // Interrupt must reach SQLite immediately, without waiting for the running query's queue.
       Function("interruptSync") { (database: NativeDatabase) in
@@ -170,10 +168,7 @@ public final class SQLiteModule: Module, @unchecked Sendable {
         exsqlite3_interrupt(database.pointer)
       }
       Function("closeSync") { (database: NativeDatabase) in
-        try maybeThrowForClosedDatabase(database)
-        if let db = removeCachedDatabase(of: database) {
-          try closeDatabase(db)
-        }
+        try closeDatabaseIfNeeded(database)
       }
     }
@@ -264,12 +259,12 @@ public final class SQLiteModule: Module, @unchecked Sendable {
   // swiftlint:disable line_length
   private func run(statement: NativeStatement, database: NativeDatabase, bindParams: [String: Any], bindBlobParams: [String: any AnyArrayBuffer], shouldPassAsArray: Bool) throws -> [String: Any] {
-    try maybeThrowForClosedDatabase(database)
-    try maybeThrowForFinalizedStatement(statement)
     // The statement with parameter bindings is stateful,
     // we have to guard with a critical section for thread safety.
     return try statement.lock.withLock { _ -> [String: Any] in
+      try maybeThrowForFinalizedStatement(statement)
+      try maybeThrowForClosedDatabase(database)
       exsqlite3_reset(statement.pointer)
       exsqlite3_clear_bindings(statement.pointer)
       for (key, param) in bindParams {
@@ -301,11 +296,11 @@ public final class SQLiteModule: Module, @unchecked Sendable {
   // swiftlint:enable line_length
   private func step(statement: NativeStatement, database: NativeDatabase) throws -> SQLiteColumnValues? {
-    try maybeThrowForClosedDatabase(database)
-    try maybeThrowForFinalizedStatement(statement)
     // Guard the stateful statement, see `run` above.
     return try statement.lock.withLock { _ -> SQLiteColumnValues? in
+      try maybeThrowForFinalizedStatement(statement)
+      try maybeThrowForClosedDatabase(database)
       let ret = exsqlite3_step(statement.pointer)
       if ret == SQLITE_ROW {
         return try getColumnValues(statement: statement)
@@ -318,11 +313,11 @@ public final class SQLiteModule: Module, @unchecked Sendable {
   }
   private func getAll(statement: NativeStatement, database: NativeDatabase) throws -> [SQLiteColumnValues] {
-    try maybeThrowForClosedDatabase(database)
-    try maybeThrowForFinalizedStatement(statement)
     // Guard the stateful statement, see `run` above.
     return try statement.lock.withLock { _ -> [SQLiteColumnValues] in
+      try maybeThrowForFinalizedStatement(statement)
+      try maybeThrowForClosedDatabase(database)
       var columnValuesList: [SQLiteColumnValues] = []
       while true {
         let ret = exsqlite3_step(statement.pointer)
@@ -343,16 +338,24 @@ public final class SQLiteModule: Module, @unchecked Sendable {
     return db.lastErrorMessage()
   }
-  private func closeDatabase(_ db: NativeDatabase) throws {
+  func closeDatabase(_ db: NativeDatabase) throws {
+    Self.cacheLock.lock()
+    defer { Self.cacheLock.unlock() }
     db.closeLock.lock()
     defer { db.closeLock.unlock() }
-    try maybeThrowForClosedDatabase(db)
+    db.statementLifecycleLock.lock()
+    defer { db.statementLifecycleLock.unlock() }
+    try db.ensureOpen()
     try maybeFinalizeAllStatements(db)
     let ret = exsqlite3_close(db.pointer)
+    // SQLITE_BUSY leaves the connection open, including its update hook.
+    if ret != SQLITE_OK {
+      throw SQLiteErrorException(convertSqlLiteErrorToString(db))
+    }
     db.isClosed = true
-    Self.lockQueue.sync {
+    Self.cacheLock.withLock {
       if let index = contextPairs.firstIndex(where: {
         guard let pair = $0.takeUnretainedValue() as? (SQLiteModule, NativeDatabase) else {
           return false
@@ -366,10 +369,6 @@ public final class SQLiteModule: Module, @unchecked Sendable {
         contextPairs.remove(at: index)
       }
     }
-    if ret != SQLITE_OK {
-      throw SQLiteErrorException(convertSqlLiteErrorToString(db))
-    }
   }
   private func deleteDatabase(databasePath: String) throws {
@@ -412,7 +411,7 @@ public final class SQLiteModule: Module, @unchecked Sendable {
   private func addUpdateHook(_ database: NativeDatabase) {
     let contextPair = Unmanaged.passRetained(((self, database) as AnyObject))
-    Self.lockQueue.sync {
+    Self.cacheLock.withLock {
       contextPairs.append(contextPair)
     }
     // swiftlint:disable:next multiline_arguments
@@ -525,27 +524,32 @@ public final class SQLiteModule: Module, @unchecked Sendable {
   // MARK: - cachedDatabases managements
   private func addCachedDatabase(_ database: NativeDatabase) {
-    Self.lockQueue.sync {
+    Self.cacheLock.withLock {
       cachedDatabases.append(database)
     }
   }
-  @discardableResult
-  private func removeCachedDatabase(of database: NativeDatabase) -> NativeDatabase? {
-    return Self.lockQueue.sync {
+  private func closeDatabaseIfNeeded(_ database: NativeDatabase) throws {
+    try Self.cacheLock.withLock {
+      try maybeThrowForClosedDatabase(database)
       if let index = cachedDatabases.firstIndex(of: database) {
         let db = cachedDatabases[index]
         if db.release() == 0 {
+          do {
+            try closeDatabase(db)
+          } catch {
+            // Keep the connection cached and owned so callers can clean up and retry.
+            db.addRef()
+            throw error
+          }
           cachedDatabases.remove(at: index)
-          return db
         }
       }
-      return nil
     }
   }
   private func findCachedDatabase(where predicate: (NativeDatabase) -> Bool) -> NativeDatabase? {
-    return Self.lockQueue.sync {
+    return Self.cacheLock.withLock {
       if let database = cachedDatabases.first(where: predicate) {
         return database
       }
@@ -554,7 +558,7 @@ public final class SQLiteModule: Module, @unchecked Sendable {
   }
   private func removeAllCachedDatabases() -> [NativeDatabase] {
-    return Self.lockQueue.sync {
+    return Self.cacheLock.withLock {
       let databases = cachedDatabases
       cachedDatabases.removeAll()
       return databases
@@ -566,17 +570,14 @@ public final class SQLiteModule: Module, @unchecked Sendable {
     guard database.openOptions.finalizeUnusedStatementsBeforeClosing else {
       return
     }
-    var stmt: OpaquePointer? = exsqlite3_next_stmt(database.pointer, nil)
-    if stmt == nil {
-      return
-    }
-    while let currentStmt = stmt {
-      let nextStmt = exsqlite3_next_stmt(database.pointer, currentStmt)
-      let ret = exsqlite3_finalize(currentStmt)
-      if ret != SQLITE_OK {
-        ExpoModulesCore.log.warn("exsqlite3_finalize failed: \(convertSqlLiteErrorToString(database))")
+    // Finalize through the wrappers so even a failed close leaves them invalidated.
+    // Do not destroy SQLite-internal statements owned by concurrent exec/backup operations.
+    for statement in database.statements {
+      do {
+        try statement.finalize(database: database)
+      } catch {
+        ExpoModulesCore.log.warn("Finalizing a statement during close failed: \(error)")
       }
-      stmt = nextStmt
     }
   }
 }

package/ios/Tests/test_StatementCleanup.swift ADDED Viewed

@@ -0,0 +1,84 @@
+// Copyright 2026-present 650 Industries. All rights reserved.
+import Testing
+@testable import ExpoModulesCore
+@testable import ExpoSQLite
+@Suite("Statement cleanup")
+struct StatementCleanupTests {
+  @Test
+  @JavaScriptActor
+  func `failed close invalidates cleaned up statements and permits retry`() throws {
+    let appContext = AppContext.create()
+    let module = SQLiteModule(appContext: appContext)
+    var pointer: OpaquePointer?
+    var destination: OpaquePointer?
+    #expect(exsqlite3_open(":memory:", &pointer) == SQLITE_OK)
+    #expect(exsqlite3_open(":memory:", &destination) == SQLITE_OK)
+    let database = NativeDatabase(pointer, databasePath: ":memory:", openOptions: OpenDatabaseOptions())
+    defer {
+      if !database.isClosed { try? module.closeDatabase(database) }
+      exsqlite3_close(destination)
+    }
+    let statement = NativeStatement()
+    try database.prepareSync(statement: statement, source: "SELECT 42 AS value")
+    // A pending backup keeps the source connection busy even after every statement is finalized.
+    // This reproduces a failed close after cleanup without depending on a thread race.
+    let backup = try #require(exsqlite3_backup_init(destination, "main", pointer, "main"))
+    do {
+      defer { exsqlite3_backup_finish(backup) }
+      #expect(throws: SQLiteErrorException.self) { try module.closeDatabase(database) }
+      #expect(!database.isClosed)
+      try #require(statement.isFinalized)
+      #expect(throws: AccessClosedResourceException.self) { try statement.getColumnNamesSync() }
+      #expect(throws: AccessClosedResourceException.self) {
+        try statement.finalizeSync(database: database)
+      }
+      let fresh = NativeStatement()
+      try database.prepareSync(statement: fresh, source: "SELECT 1 AS fresh")
+      #expect(try fresh.getColumnNamesSync() == ["fresh"])
+      try fresh.finalizeSync(database: database)
+    }
+    try module.closeDatabase(database)
+    #expect(database.isClosed)
+  }
+  @Test
+  func `preparing during close either gets cleaned up or rejects the closed database`() async throws {
+    let appContext = AppContext.create()
+    let module = SQLiteModule(appContext: appContext)
+    for _ in 0..<50 {
+      var pointer: OpaquePointer?
+      #expect(exsqlite3_open(":memory:", &pointer) == SQLITE_OK)
+      let database = NativeDatabase(pointer, databasePath: ":memory:", openOptions: OpenDatabaseOptions())
+      defer {
+        if !database.isClosed { try? module.closeDatabase(database) }
+      }
+      let statement = NativeStatement()
+      await withTaskGroup(of: Void.self) { group in
+        for index in 0..<2 {
+          group.addTask {
+            do {
+              if index == 0 {
+                try await database.prepareAsync(statement: statement, source: "SELECT 1")
+              } else {
+                try module.closeDatabase(database)
+              }
+            } catch is AccessClosedResourceException {
+              #expect(index == 0)
+            } catch {
+              Issue.record(error)
+            }
+          }
+        }
+      }
+      #expect(database.isClosed)
+      // A prepared statement must have been invalidated by cleanup.
+      #expect(statement.pointer == nil)
+    }
+  }
+}

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9-sources.jar ADDED Viewed

Binary file

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9-sources.jar.md5 ADDED Viewed

	@@ -0,0 +1 @@
1	+ f9c01cec01c62d6a619fdc69f237e033

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9-sources.jar.sha1 ADDED Viewed

	@@ -0,0 +1 @@
1	+ afa88d36ec945ad0442cc3582e05eb84b07cb9f1

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9-sources.jar.sha256 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 67dbdc88a1d7fc60c31092ad150a98a30d93d8ca82bbf869609890965425524d

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9-sources.jar.sha512 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 47d6b003042ef32b80e19b64fd015ffcfa159bb8f08971459211cd6ab971304da58dee6236c2be5319f606f9062d023530dcaa5c2e530bb17e42ab1465d5b95f

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.aar ADDED Viewed

Binary file

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.aar.md5 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 0c582335d4a9a710a780e9e636dbc73a

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.aar.sha1 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 3ef893dc3f6aec4bda329646065115814fd42d0a

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.aar.sha256 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 96b87814356fa93bcc9eb091c5b2f96f243fa661bd70740c352dae65cca23d8f

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.aar.sha512 ADDED Viewed

	@@ -0,0 +1 @@
1	+ d3fbb6aad5541429fc0b0c3edb30d9e71f12636e9215617d2cb19750aecb36c4df1efc1bc5f84fb75f816d9db01c4ad9a0f08457d67ae892e2ebb59d3bd26246

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/{58.0.7/expo.modules.sqlite-58.0.7.module → 58.0.9/expo.modules.sqlite-58.0.9.module} RENAMED Viewed

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.sqlite",
-    "version": "58.0.7",
+    "version": "58.0.9",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.sqlite-58.0.7.aar",
-          "url": "expo.modules.sqlite-58.0.7.aar",
-          "size": 3960730,
-          "sha512": "d8e00a3051371232e9f2f7bc7320e9089c55aae906bc8f8df09406ce5775b17ed540c1b9a25c2823065205cf210f597cc7f242c70110a4937dfdc1cbd59910f8",
-          "sha256": "78b46f48418af458641ebe11aa817d720cf8151df9ec6a98b1014c7afaf6b8dd",
-          "sha1": "d191c3473a6edb27ecae54943add203f7c4293bc",
-          "md5": "b04cf2c2c4827622110ee74401aa05d7"
+          "name": "expo.modules.sqlite-58.0.9.aar",
+          "url": "expo.modules.sqlite-58.0.9.aar",
+          "size": 3958907,
+          "sha512": "d3fbb6aad5541429fc0b0c3edb30d9e71f12636e9215617d2cb19750aecb36c4df1efc1bc5f84fb75f816d9db01c4ad9a0f08457d67ae892e2ebb59d3bd26246",
+          "sha256": "96b87814356fa93bcc9eb091c5b2f96f243fa661bd70740c352dae65cca23d8f",
+          "sha1": "3ef893dc3f6aec4bda329646065115814fd42d0a",
+          "md5": "0c582335d4a9a710a780e9e636dbc73a"
         }
       ]
     },
@@ -67,13 +67,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.sqlite-58.0.7.aar",
-          "url": "expo.modules.sqlite-58.0.7.aar",
-          "size": 3960730,
-          "sha512": "d8e00a3051371232e9f2f7bc7320e9089c55aae906bc8f8df09406ce5775b17ed540c1b9a25c2823065205cf210f597cc7f242c70110a4937dfdc1cbd59910f8",
-          "sha256": "78b46f48418af458641ebe11aa817d720cf8151df9ec6a98b1014c7afaf6b8dd",
-          "sha1": "d191c3473a6edb27ecae54943add203f7c4293bc",
-          "md5": "b04cf2c2c4827622110ee74401aa05d7"
+          "name": "expo.modules.sqlite-58.0.9.aar",
+          "url": "expo.modules.sqlite-58.0.9.aar",
+          "size": 3958907,
+          "sha512": "d3fbb6aad5541429fc0b0c3edb30d9e71f12636e9215617d2cb19750aecb36c4df1efc1bc5f84fb75f816d9db01c4ad9a0f08457d67ae892e2ebb59d3bd26246",
+          "sha256": "96b87814356fa93bcc9eb091c5b2f96f243fa661bd70740c352dae65cca23d8f",
+          "sha1": "3ef893dc3f6aec4bda329646065115814fd42d0a",
+          "md5": "0c582335d4a9a710a780e9e636dbc73a"
         }
       ]
     },
@@ -87,13 +87,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.sqlite-58.0.7-sources.jar",
-          "url": "expo.modules.sqlite-58.0.7-sources.jar",
-          "size": 11821,
-          "sha512": "7584658ab5c9dd4f06e3445b056b83007c6fc6162cdda3b3df67bb9b7ec45e17d686903a37feae801ee8b966ed1bd36de9386d739c783bbaec65391dbaa6dc65",
-          "sha256": "a4b537cf4b334950fc82e5d251599ed7b3bc6d5c2410a3fdca38b81650fe27c2",
-          "sha1": "1d398068a3b652c5a9392d4115c9b8258adc42ef",
-          "md5": "d1da3a6df8335c04eb1b803a0b4e73cf"
+          "name": "expo.modules.sqlite-58.0.9-sources.jar",
+          "url": "expo.modules.sqlite-58.0.9-sources.jar",
+          "size": 12434,
+          "sha512": "47d6b003042ef32b80e19b64fd015ffcfa159bb8f08971459211cd6ab971304da58dee6236c2be5319f606f9062d023530dcaa5c2e530bb17e42ab1465d5b95f",
+          "sha256": "67dbdc88a1d7fc60c31092ad150a98a30d93d8ca82bbf869609890965425524d",
+          "sha1": "afa88d36ec945ad0442cc3582e05eb84b07cb9f1",
+          "md5": "f9c01cec01c62d6a619fdc69f237e033"
         }
       ]
     }

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.module.md5 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 027bb16e5aa93ebd85e027ee2f46126a

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.module.sha1 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 214b155b65fff08267e3c51f3c305d0a60393fcd

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.module.sha256 ADDED Viewed

	@@ -0,0 +1 @@
1	+ a1a758d13d8bfa0a508a0e8e76d619145bf6e9fed21e2793b4c3250c747ab0e2

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.module.sha512 ADDED Viewed

	@@ -0,0 +1 @@
1	+ edceb164c582da1e7acbb0d0e0b64074ef17bb2af5a95a63f0d37e2272b93e8be9802bae030c92050f7dc7b357aa14ccbfa864c78d3818301aec13fecb0b04b0

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/{58.0.7/expo.modules.sqlite-58.0.7.pom → 58.0.9/expo.modules.sqlite-58.0.9.pom} RENAMED Viewed

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.sqlite</artifactId>
-  <version>58.0.7</version>
+  <version>58.0.9</version>
   <packaging>aar</packaging>
   <name>expo.modules.sqlite</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.pom.md5 ADDED Viewed

	@@ -0,0 +1 @@
1	+ b2d62f1ac9414101b72082d1f7184972

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.pom.sha1 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 4966c5a227bb7b1cd816624a1c7490c2214b26fd

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.pom.sha256 ADDED Viewed

	@@ -0,0 +1 @@
1	+ 2835028ead37c42578edaaa5b9c5f7610643bd86b825c6e099c90cbfdc764bd7

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.9/expo.modules.sqlite-58.0.9.pom.sha512 ADDED Viewed

	@@ -0,0 +1 @@
1	+ f3a422c4b7869c9b5bc74f3d85670925330e84ea0af7dbc1366e13122238618d5615159ab2db6d2e5d1b6a489ea69c2eee6051a395a64d4b4f6c841dc4c4bc23

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "expo-sqlite",
-  "version": "58.0.7",
+  "version": "58.0.9",
   "description": "Provides access to a database using SQLite (https://www.sqlite.org/). The database is persisted across restarts of your app.",
   "keywords": [
     "async-storage",
@@ -51,12 +51,12 @@
   },
   "devDependencies": {
     "@expo/spawn-async": "^1.8.0",
-    "@testing-library/react-native": "^13.3.0",
-    "@types/jest": "^29.2.1",
+    "@testing-library/react-native": "^14.0.1",
+    "@types/jest": "^30.0.0",
     "@types/node": "^22.14.0",
     "@types/react": "~19.3.0",
-    "expo": "58.0.0",
-    "expo-module-scripts": "56.0.4",
+    "expo": "58.0.3",
+    "expo-module-scripts": "56.0.6",
     "react-error-boundary": "^4.0.11",
     "tar": "^7.5.22"
   },

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7-sources.jar DELETED Viewed

Binary file

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7-sources.jar.md5 DELETED Viewed

	@@ -1 +0,0 @@
1	- d1da3a6df8335c04eb1b803a0b4e73cf

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7-sources.jar.sha1 DELETED Viewed

	@@ -1 +0,0 @@
1	- 1d398068a3b652c5a9392d4115c9b8258adc42ef

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7-sources.jar.sha256 DELETED Viewed

	@@ -1 +0,0 @@
1	- a4b537cf4b334950fc82e5d251599ed7b3bc6d5c2410a3fdca38b81650fe27c2

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7-sources.jar.sha512 DELETED Viewed

	@@ -1 +0,0 @@
1	- 7584658ab5c9dd4f06e3445b056b83007c6fc6162cdda3b3df67bb9b7ec45e17d686903a37feae801ee8b966ed1bd36de9386d739c783bbaec65391dbaa6dc65

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7.aar DELETED Viewed

Binary file

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7.aar.md5 DELETED Viewed

	@@ -1 +0,0 @@
1	- b04cf2c2c4827622110ee74401aa05d7

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7.aar.sha1 DELETED Viewed

	@@ -1 +0,0 @@
1	- d191c3473a6edb27ecae54943add203f7c4293bc

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7.aar.sha256 DELETED Viewed

	@@ -1 +0,0 @@
1	- 78b46f48418af458641ebe11aa817d720cf8151df9ec6a98b1014c7afaf6b8dd

package/local-maven-repo/host/exp/exponent/expo.modules.sqlite/58.0.7/expo.modules.sqlite-58.0.7.aar.sha512 DELETED Viewed

	@@ -1 +0,0 @@
1	- d8e00a3051371232e9f2f7bc7320e9089c55aae906bc8f8df09406ce5775b17ed540c1b9a25c2823065205cf210f597cc7f242c70110a4937dfdc1cbd59910f8