expo-sqlite 13.3.0 → 13.4.0

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 13.4.0 — 2024-03-20
+
+### 🐛 Bug fixes
+
+- Enabled [FTS](https://www.sqlite.org/fts3.html) and [FTS5](https://www.sqlite.org/fts5.html) for SQLite. ([#27738](https://github.com/expo/expo/pull/27738) by [@kudo](https://github.com/kudo))
+- Fixed `NullPointerException` on Android when opening the same database multiple times. ([#27748](https://github.com/expo/expo/pull/27748) by [@kudo](https://github.com/kudo))
+
 ## 13.3.0 — 2024-03-05
 
 ### 🎉 New features

package/android/CMakeLists.txt

@@ -10,11 +10,10 @@ set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set(SRC_DIR "${CMAKE_SOURCE_DIR}/src/main/cpp")
 file(GLOB SOURCES "${SRC_DIR}/*.cpp")
 
-if (NOT "${SQLITE_CUSTOM_BUILDFLAGS}" STREQUAL "")
-  add_compile_options(
-    "${SQLITE_CUSTOM_BUILDFLAGS}"
-  )
-endif()
+separate_arguments(SQLITE_BUILDFLAGS)
+add_compile_options(
+  ${SQLITE_BUILDFLAGS}
+)
 
 add_library(
   ${PACKAGE_NAME}

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'de.undercouch.download'
 
 group = 'host.exp.exponent'
-version = '13.3.0'
+version = '13.4.0'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -32,6 +32,20 @@ def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
 def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("$buildDir/downloads")
 def SQLITE3_SRC_DIR = new File("$buildDir/sqlite3_src")
 
+def getSQLiteBuildFlags() {
+  def buildFlags = ''
+  if (findProperty('expo.sqlite.enableFTS') !== 'false') {
+    buildFlags <<= '-DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS5=1'
+  } else {
+  }
+  def customBuildFlags = findProperty('expo.sqlite.customBuildFlags') ?: ''
+  if (customBuildFlags != '') {
+    buildFlags <<= " ${customBuildFlags}"
+  }
+  logger.info("SQLite build flags: ${buildFlags}")
+  return buildFlags
+}
+
 def reactNativeArchitectures() {
   def value = project.getProperties().get("reactNativeArchitectures")
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
@@ -116,14 +130,14 @@ android {
   namespace "expo.modules.sqlite"
   defaultConfig {
     versionCode 18
-    versionName "13.3.0"
+    versionName "13.4.0"
 
     externalNativeBuild {
       cmake {
         abiFilters (*reactNativeArchitectures())
         arguments "-DANDROID_STL=c++_shared",
           "-DSQLITE3_SRC_DIR=${toPlatformIndependentPath(SQLITE3_SRC_DIR)}",
-          "-DSQLITE_CUSTOM_BUILDFLAGS=${findProperty('expo.sqlite.customBuildFlags') ?: ''}"
+          "-DSQLITE_BUILDFLAGS=${getSQLiteBuildFlags()}"
       }
     }
   }

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

@@ -3,9 +3,15 @@
 package expo.modules.sqlite
 
 import expo.modules.kotlin.sharedobjects.SharedRef
+import java.util.concurrent.atomic.AtomicInteger
 
 internal class NativeDatabase(val databaseName: String, val openOptions: OpenDatabaseOptions) : SharedRef<NativeDatabaseBinding>(NativeDatabaseBinding()) {
   var isClosed = false
+  private val refCount = AtomicInteger(1)
+
+  internal fun addRef() {
+    refCount.incrementAndGet()
+  }
 
   override fun equals(other: Any?): Boolean {
     return other is NativeDatabase && this.ref == other.ref
@@ -13,6 +19,9 @@ internal class NativeDatabase(val databaseName: String, val openOptions: OpenDat
 
   override fun deallocate() {
     super.deallocate()
-    this.ref.close()
+    val shouldClose = refCount.decrementAndGet() <= 0
+    if (shouldClose) {
+      this.ref.close()
+    }
   }
 }

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

@@ -60,6 +60,7 @@ class SQLiteModuleNext : Module() {
 
           // Try to find opened database for fast refresh
           findCachedDatabase { it.databaseName == databaseName && it.openOptions == options && !options.useNewConnection }?.let {
+            it.addRef()
             return@Constructor it
           }
 

package/ios/ExpoSQLite.podspec

@@ -1,6 +1,9 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
+podfile_properties = JSON.parse(File.read("#{Pod::Config.instance.installation_root}/Podfile.properties.json")) rescue {}
+
+sqliteVersion = '3.42.0'
 
 Pod::Spec.new do |s|
   s.name           = 'ExpoSQLite'
@@ -14,8 +17,12 @@ Pod::Spec.new do |s|
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
   s.dependency 'ExpoModulesCore'
-  # The builtin sqlite does not support extensions so we update it
-  s.dependency 'sqlite3', '~> 3.42.0'
+
+  s.dependency 'sqlite3', "~> #{sqliteVersion}"
+  unless podfile_properties['expo.sqlite.enableFTS'] === 'false'
+    s.dependency 'sqlite3/fts', "~> #{sqliteVersion}"
+    s.dependency 'sqlite3/fts5', "~> #{sqliteVersion}"
+  end
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-sqlite",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "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",
@@ -57,5 +57,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "008e3d4a9d9f68d681d1a07a2ad2cffe3c122c3a"
+  "gitHead": "74264a222fcc02d5885b451597113df852d272fb"
 }