Merge branch 'development'

Author: groue

.github/workflows/CI.yml

@@ -1,4 +1,4 @@
-# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
 
 name: "GRDB CI"
 
@@ -40,17 +40,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
             destination: "platform=macOS"
             name: "macOS"
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
-            destination: "OS=18.1,name=iPhone 16 Pro"
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
+            destination: "OS=18.5,name=iPhone 16 Pro"
             name: "iOS"
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
-            destination: "OS=18.1,name=Apple TV"
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
+            destination: "OS=18.5,name=Apple TV"
             name: "tvOS"
     steps:
       - uses: actions/checkout@v5
@@ -66,9 +66,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
-            name: "Xcode 16.1"
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
+            name: "Xcode 16.4"
     steps:
       - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
@@ -83,9 +83,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
-            name: "Xcode 16.1"
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
+            name: "Xcode 16.4"
     steps:
       - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
@@ -100,9 +100,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
-            name: "Xcode 16.1"
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
+            name: "Xcode 16.4"
     steps:
       - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
@@ -117,9 +117,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
-            name: "Xcode 16.1"
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
+            name: "Xcode 16.4"
     steps:
       - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
@@ -134,9 +134,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16.1.app"
-            runsOn: macOS-14
-            name: "Xcode 16.1"
+          - xcode: "Xcode_16.4.app"
+            runsOn: macOS-15
+            name: "Xcode 16.4"
     steps:
       - uses: actions/checkout@v5
       - name: ${{ matrix.name }}

.spi.yml

@@ -2,4 +2,4 @@ version: 1
 builder:
   configs:
     - documentation_targets: [GRDB]
-      swift_version: 6.0
+      swift_version: 6.1

CHANGELOG.md

@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 7.x Releases
 
+- `7.9.x` Releases - [7.9.0](#790)
 - `7.8.x` Releases - [7.8.0](#780)
 - `7.7.x` Releases - [7.7.0](#770) - [7.7.1](#771)
 - `7.6.x` Releases - [7.6.0](#760) - [7.6.1](#761)
@@ -140,6 +141,37 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 7.9.0
+
+Released December 13, 2025
+
+- **Breaking Change**: Simplify the compiler checks for the availability of SQLite snapshots by [@groue](https://github.com/groue) in [#1826](https://github.com/groue/GRDB.swift/pull/1826)
+
+    This change aims at easing Linux and Android compatibility.
+    
+    **The library requirements are raised to Swift 6.1+, Xcode 16.3+.**
+
+- **Breaking Change**: Accept multiple SQLCipher libraries by [@groue](https://github.com/groue) in [#1819](https://github.com/groue/GRDB.swift/pull/1819)
+
+    This change aims at easing building GRDB against various SQLCipher flavors.
+    
+    **The compiler flag that enables new GRDB APIs for SQLCipher is now `SQLITE_HAS_CODEC`.**
+
+- **Fixed**: Fix cancellation of async tasks that use the FTS5 full-text engine by [@groue](https://github.com/groue) in [#1839](https://github.com/groue/GRDB.swift/pull/1839)
+
+    This workarounds an [SQLite bug](https://sqlite.org/forum/forumpost/95413eb410) that would trigger a GRDB crash, and improves the robustness of the library regarding database accesses cancellation and database interruption.
+
+- **New**: Improve the ergonomics of `DatabaseMigrator.registerMigration(_:foreignKeyChecks:merging:migrate)`, introduced in [#1818](https://github.com/groue/GRDB.swift/pull/1818), by accepting that the name of the merged migration is included in the set of merged migrations:
+
+    ```swift
+    // Used to fail, now OK:
+    migrator.registerMigration("v3", merging: ["v1", "v2", "v3"]) { ... }
+    //                         ~~~~                        ~~~~
+    
+    // The above code is equivalent to:
+    migrator.registerMigration("v3", merging: ["v1", "v2"]) { ... }
+    ```
+
 ## 7.8.0
 
 Released October 2, 2025
@@ -4370,7 +4402,7 @@ Released April 3, 2017
 
 **Breaking Changes**
 
-- SQLite C API is now available right from the GRBD module: you don't need any longer to import `SQLiteiPhoneOS` module et al (see documentation for [Raw SQLite Pointers](https://github.com/groue/GRDB.swift#raw-sqlite-pointers)).
+- SQLite C API is now available right from the GRDB module: you don't need any longer to import `SQLiteiPhoneOS` module et al (see documentation for [Raw SQLite Pointers](https://github.com/groue/GRDB.swift#raw-sqlite-pointers)).
 - The [manual installation procedure for WatchOS extensions](https://github.com/groue/GRDB.swift#installation) has changed.
 - [Carthage](https://github.com/Carthage/Carthage) is no longer supported. At the present time it is unable to support the various frameworks built by GRDB (system SQLite, SQLCipher, custom SQLite builds, etc.)
 

Documentation/DemoApps/GRDBDemo/GRDBDemo.xcodeproj/project.pbxproj

@@ -382,7 +382,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 6.0;
+				SWIFT_VERSION = 6.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -411,7 +411,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 6.0;
+				SWIFT_VERSION = 6.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -427,7 +427,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBDemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 6.0;
+				SWIFT_VERSION = 6.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GRDBDemo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/GRDBDemo";
 			};
@@ -444,7 +444,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.groue.GRDBDemoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 6.0;
+				SWIFT_VERSION = 6.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GRDBDemo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/GRDBDemo";
 			};

GRDB.swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'GRDB.swift'
-  s.version  = '7.8.0'
+  s.version  = '7.9.0'
 
   s.license  = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'A toolkit for SQLite databases, with a focus on application development.'
@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/groue/GRDB.swift.git', :tag => "v#{s.version}" }
   s.module_name = 'GRDB'
 
-  s.swift_versions = ['6']
+  s.swift_versions = ['6.1']
   s.ios.deployment_target = '13.0'
   s.osx.deployment_target = '10.15'
   s.watchos.deployment_target = '7.0'
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
     ss.framework = 'Foundation'
     ss.library = 'sqlite3'
     ss.xcconfig = {
-      'OTHER_SWIFT_FLAGS' => '$(inherited) -D SQLITE_ENABLE_FTS5',
+      'OTHER_SWIFT_FLAGS' => '$(inherited) -D SQLITE_ENABLE_FTS5 -D GRDBFRAMEWORK',
     }
   end
 

GRDB.xcodeproj/project.pbxproj

@@ -292,6 +292,7 @@
 		56BB6EA91D3009B100A1CA52 /* SchedulingWatchdog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BB6EA81D3009B100A1CA52 /* SchedulingWatchdog.swift */; };
 		56BCA2622E6C28F800E4F08D /* DatabaseSchemaSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BCA2612E6C28EF00E4F08D /* DatabaseSchemaSourceTests.swift */; };
 		56BF2282241781C5003D86EB /* UtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BF2281241781C5003D86EB /* UtilsTests.swift */; };
+		56C7979B2EE99BD000AA265D /* Issue1838Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56C7979A2EE99BD000AA265D /* Issue1838Tests.swift */; };
 		56CC922C201DFFB900CB597E /* DropWhileCursorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CC922B201DFFB900CB597E /* DropWhileCursorTests.swift */; };
 		56CC9243201E034D00CB597E /* PrefixWhileCursorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CC9242201E034D00CB597E /* PrefixWhileCursorTests.swift */; };
 		56CC9246201E058100CB597E /* DropFirstCursorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CC9245201E058000CB597E /* DropFirstCursorTests.swift */; };
@@ -802,6 +803,7 @@
 		56C3F7521CF9F12400F6A361 /* DatabaseSavepointTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseSavepointTests.swift; sourceTree = "<group>"; };
 		56C48E731C9A9923005DF1D9 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		56C494401ED7255500CC72AF /* GRDBDeploymentTarget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = GRDBDeploymentTarget.xcconfig; sourceTree = "<group>"; };
+		56C7979A2EE99BD000AA265D /* Issue1838Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Issue1838Tests.swift; sourceTree = "<group>"; };
 		56CC922B201DFFB900CB597E /* DropWhileCursorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropWhileCursorTests.swift; sourceTree = "<group>"; };
 		56CC9242201E034D00CB597E /* PrefixWhileCursorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefixWhileCursorTests.swift; sourceTree = "<group>"; };
 		56CC9245201E058000CB597E /* DropFirstCursorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DropFirstCursorTests.swift; sourceTree = "<group>"; };
@@ -1448,6 +1450,7 @@
 				56B964C21DA521450002DA19 /* FTS5TableBuilderTests.swift */,
 				5698ACCA1DA62A2D0056AF8C /* FTS5TokenizerTests.swift */,
 				56ED8A7E1DAB8D6800BD0ABC /* FTS5WrapperTokenizerTests.swift */,
+				56C7979A2EE99BD000AA265D /* Issue1838Tests.swift */,
 			);
 			name = FTS;
 			sourceTree = "<group>";
@@ -2130,6 +2133,7 @@
 				56D496C11D81373A008276D7 /* DatabaseQueueBackupTests.swift in Sources */,
 				562393721DEE104400A6B01F /* MapCursorTests.swift in Sources */,
 				56D496571D81303E008276D7 /* FoundationDateComponentsTests.swift in Sources */,
+				56C7979B2EE99BD000AA265D /* Issue1838Tests.swift in Sources */,
 				568C3F7A2A5AB2C300A2309D /* ForeignKeyDefinitionTests.swift in Sources */,
 				56D496701D81309E008276D7 /* RecordPrimaryKeyRowIDTests.swift in Sources */,
 				5622060C1E420EB3005860AC /* DatabaseQueueConcurrencyTests.swift in Sources */,

GRDB/Core/Configuration.swift

@@ -1,10 +1,13 @@
 // Import C SQLite functions
-#if SWIFT_PACKAGE
-import GRDBSQLite
-#elseif GRDBCIPHER
+#if GRDBCIPHER // CocoaPods (SQLCipher subspec)
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif GRDBFRAMEWORK // GRDB.xcodeproj or CocoaPods (standard subspec)
 import SQLite3
+#elseif GRDBCUSTOMSQLITE // GRDBCustom Framework
+// #elseif SomeTrait
+// import ...
+#else // Default SPM trait must be the default. It impossible to detect from Xcode.
+import GRDBSQLite
 #endif
 
 #if !canImport(Darwin)

GRDB/Core/Database+Schema.swift

@@ -1,10 +1,13 @@
 // Import C SQLite functions
-#if SWIFT_PACKAGE
-import GRDBSQLite
-#elseif GRDBCIPHER
+#if GRDBCIPHER // CocoaPods (SQLCipher subspec)
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif GRDBFRAMEWORK // GRDB.xcodeproj or CocoaPods (standard subspec)
 import SQLite3
+#elseif GRDBCUSTOMSQLITE // GRDBCustom Framework
+// #elseif SomeTrait
+// import ...
+#else // Default SPM trait must be the default. It impossible to detect from Xcode.
+import GRDBSQLite
 #endif
 
 extension Database {
@@ -138,7 +141,7 @@ extension Database {
         }
     }
 
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
     /// Returns information about a table or a view
     func table(_ tableName: String) throws -> TableInfo? {
         for schemaID in try fetchSchemaIdentifiers() {
@@ -572,7 +575,7 @@ extension Database {
     /// - precondition: table exists.
     private func fetchTableHasRowID(_ table: DatabaseObjectID) throws -> Bool {
         // Prefer PRAGMA table_list if available
-#if GRDBCUSTOMSQLITE || GRDBCIPHER
+#if GRDBCUSTOMSQLITE || SQLITE_HAS_CODEC
         // Maybe SQLCipher is too old: check actual version
         if sqlite3_libversion_number() >= 3037000 {
             return try self.table(for: table)!.isWithoutRowIDTable == false

GRDB/Core/Database+Statements.swift

@@ -1,10 +1,13 @@
 // Import C SQLite functions
-#if SWIFT_PACKAGE
-import GRDBSQLite
-#elseif GRDBCIPHER
+#if GRDBCIPHER // CocoaPods (SQLCipher subspec)
 import SQLCipher
-#elseif !GRDBCUSTOMSQLITE && !GRDBCIPHER
+#elseif GRDBFRAMEWORK // GRDB.xcodeproj or CocoaPods (standard subspec)
 import SQLite3
+#elseif GRDBCUSTOMSQLITE // GRDBCustom Framework
+// #elseif SomeTrait
+// import ...
+#else // Default SPM trait must be the default. It impossible to detect from Xcode.
+import GRDBSQLite
 #endif
 
 import Foundation
@@ -510,6 +513,27 @@ extension Database {
             publicStatementArguments: configuration.publicStatementArguments)
     }
 
+    /// Always throws an error
+    func statementCompilationDidFail(
+        at statementStart: UnsafePointer<CChar>,
+        withResultCode resultCode: CInt
+    ) throws -> Never {
+        switch ResultCode(rawValue: resultCode) {
+        case .SQLITE_INTERRUPT, .SQLITE_ABORT:
+            // The only error that a user sees when a Task is cancelled
+            // is CancellationError.
+            try suspensionMutex.load().checkCancellation()
+        default:
+            break
+        }
+        
+        // Throw compilation failure
+        throw DatabaseError(
+            resultCode: resultCode,
+            message: lastErrorMessage,
+            sql: String(cString: statementStart))
+    }
+    
     private func checkForAutocommitTransition() {
         if sqlite3_get_autocommit(sqliteConnection) == 0 {
             if autocommitState == .on {