expo-sqlite 11.7.0 → 11.7.1

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 11.7.1 — 2023-09-18
+
+### 🐛 Bug fixes
+
+- Fix broken JS test. ([#24498](https://github.com/expo/expo/pull/24498) by [@alanjhughes](https://github.com/alanjhughes))
+
+### 💡 Others
+
+- [iOS] Bump `SQLite`version to latest. ([#24375](https://github.com/expo/expo/pull/24375) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 11.7.0 — 2023-09-15
 
 ### 🐛 Bug fixes
@@ -21,6 +31,7 @@
 ### 🎉 New features
 
 - Add support for running raw queries on Android. ([#24320](https://github.com/expo/expo/pull/24320) by [@alanjhughes](https://github.com/alanjhughes))
+- On Android, add support for `CRSQLite`. ([#24322](https://github.com/expo/expo/pull/24322) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 🐛 Bug fixes
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '11.7.0'
+version = '11.7.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -70,7 +70,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 18
-    versionName "11.7.0"
+    versionName "11.7.1"
   }
   lintOptions {
     abortOnError false
@@ -85,7 +85,7 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  implementation 'com.github.requery:sqlite-android:3.39.2'
+  implementation 'com.github.alanjhughes:sqlite-android:0.0.3'
   implementation "androidx.sqlite:sqlite-ktx:2.3.1"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }

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

@@ -2,6 +2,7 @@ package expo.modules.sqlite
 
 import expo.modules.kotlin.records.Field
 import expo.modules.kotlin.records.Record
+import expo.modules.kotlin.types.Enumerable
 
 data class Query(
   @Field
@@ -9,3 +10,10 @@ data class Query(
   @Field
   val args: List<Any?>
 ) : Record
+
+enum class SqlAction(val value: String) : Enumerable {
+  INSERT("insert"),
+  UPDATE("update"),
+  DELETE("delete"),
+  UNKNOWN("unknown")
+}

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

@@ -3,10 +3,13 @@ package expo.modules.sqlite
 
 import android.content.Context
 import android.database.Cursor
-import io.requery.android.database.sqlite.SQLiteDatabase
+import androidx.core.os.bundleOf
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
+import io.expo.android.database.sqlite.SQLiteCustomExtension
+import io.expo.android.database.sqlite.SQLiteDatabase
+import io.expo.android.database.sqlite.SQLiteDatabaseConfiguration
 import java.io.File
 import java.io.IOException
 import java.util.*
@@ -23,6 +26,8 @@ class SQLiteModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExpoSQLite")
 
+    Events("onDatabaseChange")
+
     AsyncFunction("exec") { dbName: String, queries: List<Query>, readOnly: Boolean ->
       return@AsyncFunction execute(dbName, queries, readOnly)
     }
@@ -55,6 +60,12 @@ class SQLiteModule : Module() {
         throw DeleteDatabaseException(dbName)
       }
     }
+
+    OnDestroy {
+      DATABASES.values.forEach {
+        it?.rawQuery("SELECT crsql_finalize()", emptyArray())
+      }
+    }
   }
 
   private fun execute(dbName: String, queries: List<Query>, readOnly: Boolean, raw: Boolean = false): List<Any> {
@@ -141,20 +152,11 @@ class SQLiteModule : Module() {
       }
 
       if (isInsert(sql)) {
-        val rowsAffected = getRowsAffected(db).let {
-          it.first.close()
-          it.second
-        }
-        val insertId = getInsertId(db).let {
-          it.first.close()
-          it.second
-        }
+        val rowsAffected = getRowsAffected(db)
+        val insertId = getInsertId(db)
         SQLitePluginResult(rows, columnNames, rowsAffected, insertId, null)
       } else if (isDelete(sql) || isUpdate(sql)) {
-        val rowsAffected = getRowsAffected(db).let {
-          it.first.close()
-          it.second
-        }
+        val rowsAffected = getRowsAffected(db)
         SQLitePluginResult(rows, columnNames, rowsAffected, 0, null)
       } else {
         EMPTY_RESULT
@@ -164,7 +166,7 @@ class SQLiteModule : Module() {
 
   private fun getRowsAffected(
     db: SQLiteDatabase,
-  ): Pair<Cursor, Int> {
+  ): Int {
     val cursor = db.rawQuery("SELECT changes() AS numRowsAffected", null)
     val rowsAffected = if (cursor.moveToFirst()) {
       val index = cursor.getColumnIndex("numRowsAffected")
@@ -172,12 +174,13 @@ class SQLiteModule : Module() {
     } else {
       -1
     }
-    return Pair(cursor, rowsAffected)
+    cursor.close()
+    return rowsAffected
   }
 
   private fun getInsertId(
     db: SQLiteDatabase,
-  ): Pair<Cursor, Long> {
+  ): Long {
     val cursor = db.rawQuery("SELECT last_insert_rowid() AS insertId", null)
     val insertId = if (cursor.moveToFirst()) {
       val index = cursor.getColumnIndex("insertId")
@@ -185,7 +188,8 @@ class SQLiteModule : Module() {
     } else {
       -1
     }
-    return Pair(cursor, insertId)
+    cursor.close()
+    return insertId
   }
 
   // do a select operation
@@ -245,12 +249,37 @@ class SQLiteModule : Module() {
     }
     if (database == null) {
       DATABASES.remove(name)
-      database = SQLiteDatabase.openOrCreateDatabase(path, null)
+      val config = createConfig(path)
+      database = SQLiteDatabase.openDatabase(config, null, null)
+      addUpdateListener(database)
       DATABASES[name] = database
     }
     return database!!
   }
 
+  private fun createConfig(path: String): SQLiteDatabaseConfiguration {
+    val crsqliteExtension = SQLiteCustomExtension("libcrsqlite", "sqlite3_crsqlite_init")
+    return SQLiteDatabaseConfiguration(path, SQLiteDatabase.CREATE_IF_NECESSARY, emptyList(), emptyList(), listOf(crsqliteExtension))
+  }
+
+  private fun addUpdateListener(database: SQLiteDatabase?) {
+    database?.addUpdateListener { tableName: String, operationType: Int, rowID: Int ->
+      sendEvent(
+        "onDatabaseChange",
+        bundleOf(
+          "tableName" to tableName,
+          "rowId" to rowID,
+          "typeId" to when (operationType) {
+            9 -> SqlAction.DELETE.value
+            18 -> SqlAction.INSERT.value
+            23 -> SqlAction.UPDATE.value
+            else -> SqlAction.UNKNOWN.value
+          }
+        )
+      )
+    }
+  }
+
   internal class SQLitePluginResult(
     val rows: Array<Array<Any?>>,
     val columns: Array<String?>,

package/ios/ExpoSQLite.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
   s.dependency 'ExpoModulesCore'
   # The builtin sqlite does not support extensions so we update it
-  s.dependency 'sqlite3', '3.39.2'
+  s.dependency 'sqlite3', '~> 3.42.0'
   
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

package/ios/crsqlite.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>crsqlite.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>crsqlite.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-sqlite",
-  "version": "11.7.0",
+  "version": "11.7.1",
   "description": "Provides access to a database that can be queried through a WebSQL-like API (https://www.w3.org/TR/webdatabase/). The database is persisted across restarts of your app.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee2c866ba3c7fbc35ff2a3e896041cf15d3bd7c5"
+  "gitHead": "62f76105dfb436f7144440d6e6077d4ff3263842"
 }