expo-sqlite 58.0.16 → 58.0.17

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 58.0.17
+
+### Patch Changes
+
+- [iOS][Android] Fix every later transaction on a connection failing with `cannot commit transaction - SQL statements in progress` after a statement fails with `database is locked`, by resetting the statement when its run fails. ([#51413](https://github.com/expo/expo/pull/51413) by [@expo-bot](https://github.com/expo-bot))
+- [iOS][Android] Fix `finalizeAsync()` and `finalizeSync()` not reporting the earlier error of a failed `run()`, by resetting the statement only when the run fails with `database is locked`. ([#53339](https://github.com/expo/expo/pull/53339) by [@expo-tuft](https://github.com/apps/expo-tuft))
+
 ## 58.0.16
 
 ### Patch Changes

package/android/build.gradle

@@ -47,7 +47,7 @@ def reactNativeArchitectures() {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.16'
+version = '58.0.17'
 
 expoModule {
   v2 true
@@ -57,7 +57,7 @@ android {
   namespace "expo.modules.sqlite"
   defaultConfig {
     versionCode 18
-    versionName "58.0.16"
+    versionName "58.0.17"
     buildConfigField "boolean", "WITH_SQLITE_VEC", project.ext.WITH_SQLITE_VEC.toString()
 
     externalNativeBuild {

package/android/src/main/java/expo/modules/sqlite/NativeDatabaseBinding.kt

@@ -89,6 +89,7 @@ internal class NativeDatabaseBinding : Closeable {
 
     // These error code should be synced with sqlite3.h
     const val SQLITE_OK = 0
+    const val SQLITE_BUSY = 5
 
     const val SQLITE_ROW = 100
     const val SQLITE_DONE = 101

package/android/src/main/java/expo/modules/sqlite/NativeStatement.kt

@@ -113,7 +113,15 @@ internal class NativeStatement @JS constructor() : SharedRef<NativeStatementBind
 
       val ret = ref.sqlite3_step()
       if (ret != NativeDatabaseBinding.SQLITE_ROW && ret != NativeDatabaseBinding.SQLITE_DONE) {
-        throw SQLiteErrorException(ref.getLastErrorMessage())
+        // A step that fails with SQLITE_BUSY leaves the statement running, so every later COMMIT
+        // on the connection fails until the statement is reset.
+        // Reset only for SQLITE_BUSY. A reset also clears other errors, which finalize() must still report.
+        // Read the message first. sqlite3_reset() replaces lastErrorMessage.
+        val message = ref.getLastErrorMessage()
+        if ((ret and 0xff) == NativeDatabaseBinding.SQLITE_BUSY) {
+          ref.sqlite3_reset()
+        }
+        throw SQLiteErrorException(message)
       }
       val firstRowValues: List<Any?> =
         if (ret == NativeDatabaseBinding.SQLITE_ROW) {

package/dev-plugin-dist/+not-found.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css" as="style"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js" as="script"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-acb144d1f99a64d1785af7527d659b2a.js" as="script"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-a91396a33c562b43d2b77a6ffc575fb7.js" as="script"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-e3975197f566bcbd43c64e4d22104a7f.js" as="script"/><style id="expo-reset">#root,body,html{height:100%}body{overflow:hidden}#root{display:flex}</style><style id="react-native-stylesheet">[stylesheet-group="0"]{}
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/css/global-b1bdf830cdbd0ec4238cc5f230f99460.css" as="style"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js" as="script"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-87e9b74b8486b174fe5b606bf7605e65.js" as="script"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-bb2542041f1b094a8c75f25287f1eab8.js" as="script"/><link rel="preload" href="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-cb0627e9624da3ffdb031f02342db7b2.js" as="script"/><style id="expo-reset">#root,body,html{height:100%}body{overflow:hidden}#root{display:flex}</style><style id="react-native-stylesheet">[stylesheet-group="0"]{}
 body{margin:0;}
 button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
 html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0,0,0,0);}
@@ -313,4 +313,4 @@ input::-webkit-search-cancel-button,input::-webkit-search-decoration,input::-web
 @keyframes r-1pzkwqh{0%{transform:translateY(100%);}100%{transform:translateY(0%);}}
 @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><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 defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js"></script><script defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-acb144d1f99a64d1785af7527d659b2a.js"></script><script defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-a91396a33c562b43d2b77a6ffc575fb7.js"></script><script defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-e3975197f566bcbd43c64e4d22104a7f.js"></script><script id="_R_">globalThis.__EXPO_ROUTER_HYDRATE__=true;</script></body></html>
+@keyframes r-t2lo5v{0%{opacity:1;}100%{opacity:0;}}</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 defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__expo-metro-runtime-8c088df87a31e4e6accd81c554ec290d.js"></script><script defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/_layout-87e9b74b8486b174fe5b606bf7605e65.js"></script><script defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/__common-bb2542041f1b094a8c75f25287f1eab8.js"></script><script defer="" src="/_expo/plugins/expo-sqlite/_expo/static/js/web/entry-cb0627e9624da3ffdb031f02342db7b2.js"></script><script id="_R_">globalThis.__EXPO_ROUTER_HYDRATE__=true;</script></body></html>