Merge branch 'development'

Author: groue

CHANGELOG.md

@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 7.x Releases
 
+- `7.6.x` Releases - [7.6.0](#760)
 - `7.5.x` Releases - [7.5.0](#750)
 - `7.4.x` Releases - [7.4.0](#740) - [7.4.1](#741)
 - `7.3.x` Releases - [7.3.0](#730)
@@ -137,6 +138,16 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 7.6.0
+
+Released July 20, 2025
+
+- **New**: All closures that accept DatabaseComponents can throw by [@groue](https://github.com/groue) in [#1768](https://github.com/groue/GRDB.swift/pull/1768)
+- **New**: Add Sendable conformance to DatabasePreUpdateEvent.Kind, matching DatabaseEvent.Kind by [@Jason-Abbott](https://github.com/Jason-Abbott) in [#1773](https://github.com/groue/GRDB.swift/pull/1773)
+- **New**: Add custom build instruction for hardened runtime by [@Jason-Abbott](https://github.com/Jason-Abbott) in [#1776](https://github.com/groue/GRDB.swift/pull/1776)
+- **New**: Access task locals from asynchronous database accesses by [@groue](https://github.com/groue) in [#1794](https://github.com/groue/GRDB.swift/pull/1794)
+- **New**: Throwing row accessors by [@groue](https://github.com/groue) in [#1796](https://github.com/groue/GRDB.swift/pull/1796)
+
 ## 7.5.0
 
 Released May 11, 2025

Documentation/AssociationsBasics.md

@@ -2186,26 +2186,25 @@ struct BookInfo: FetchableRecord {
 
     init(row: Row) throws {
         book = try Book(row: row)
-        author = row["author"]
-        country = row["country"]
-        coverImage = row["coverImage"]
+        author = try row.decode(forKey: "author")
+        country = try row.decodeIfPresent(forKey: "country")
+        coverImage = try row.decodeIfPresent(forKey: "coverImage")
     }
 }
 
 let bookInfos: [BookInfo] = try BookInfo.fetchAll(db, request)
 ```
 
-You are already familiar with row subscripts to decode [database values](../README.md#column-values):
+When you extract a record from a row, GRDB looks up the tree of **association keys**:
 
 ```swift
-let name: String = row["name"]
+let author = try row.decode(Author.self, forKey: "author")
 ```
 
-When you extract a record instead of a value from a row, GRDB looks up the tree of **association keys**. If the key is not found, or only associated with columns that all contain NULL values, an optional record is decoded as nil:
+If the key is not found, or only associated with columns that are all NULL, an optional record is decoded as nil:
 
 ```swift
-let author: Author = row["author"]
-let country: Country? = row["country"]
+let country = try row.decodeIfPresent(Country.self, forKey: "country")
 ```
 
 You can also perform custom navigation in the tree by using *row scopes*. See [Row Adapters] for more information.
@@ -2221,7 +2220,7 @@ struct AuthorInfo: FetchableRecord {
 
     init(row: Row) throws {
         author = try Author(row: row)
-        books = row["books"]
+        books = try row.decode(forKey: "books")
     }
 }
 

Documentation/CustomSQLiteBuilds.md

@@ -12,47 +12,47 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
 **To install GRDB with a custom SQLite build:**
 
 1. Clone the GRDB git repository, checkout the latest tagged version:
-    
+
     ```sh
     cd [GRDB directory]
     git checkout [latest tag]
     git submodule update --init SQLiteCustom/src
     ```
-    
+
 2. Choose your [extra compilation options](https://www.sqlite.org/compile.html). For example, `SQLITE_ENABLE_FTS5`, `SQLITE_ENABLE_PREUPDATE_HOOK`.
-    
+
     It is recommended that you enable the `SQLITE_ENABLE_SNAPSHOT` option. It allows GRDB to optimize [ValueObservation](https://swiftpackageindex.com/groue/GRDB.swift/documentation/grdb/valueobservation) when you use a [Database Pool](https://swiftpackageindex.com/groue/GRDB.swift/documentation/grdb/databasepool).
 
 3. Create a folder named `GRDBCustomSQLite` somewhere in your project directory.
 
 4. Create four files in the `GRDBCustomSQLite` folder:
 
     - `SQLiteLib-USER.xcconfig`: this file sets the extra SQLite compilation flags.
-        
+
         ```xcconfig
         // As many -D options as there are custom SQLite compilation options
         // Note: there is no space between -D and the option name.
         CUSTOM_SQLLIBRARY_CFLAGS = -DSQLITE_ENABLE_SNAPSHOT -DSQLITE_ENABLE_FTS5
         ```
-    
+
     - `GRDBCustomSQLite-USER.xcconfig`: this file lets GRDB know about extra compilation flags, and enables extra GRDB APIs.
-        
+
         ```xcconfig
         // As many -D options as there are custom SQLite compilation options
         // Note: there is one space between -D and the option name.
         CUSTOM_OTHER_SWIFT_FLAGS = -D SQLITE_ENABLE_SNAPSHOT -D SQLITE_ENABLE_FTS5
         ```
-    
+
     - `GRDBCustomSQLite-USER.h`: this file lets your application know about extra compilation flags.
-        
+
         ```c
         // As many #define as there are custom SQLite compilation options
         #define SQLITE_ENABLE_SNAPSHOT
         #define SQLITE_ENABLE_FTS5
         ```
-    
+
     - `GRDBCustomSQLite-INSTALL.sh`: this file installs the three other files.
-        
+
         ```sh
         # License: MIT License
         # https://github.com/swiftlyfalling/SQLiteLib/blob/master/LICENSE
@@ -61,52 +61,52 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
         #                   PROJECT PATHS
         #  !! MODIFY THESE TO MATCH YOUR PROJECT HIERARCHY !!
         #######################################################
-        
+
         # The path to the folder containing GRDBCustom.xcodeproj:
         GRDB_SOURCE_PATH="${PROJECT_DIR}/GRDB"
-        
+
         # The path to your custom "SQLiteLib-USER.xcconfig":
         SQLITELIB_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/SQLiteLib-USER.xcconfig"
-        
+
         # The path to your custom "GRDBCustomSQLite-USER.xcconfig":
         CUSTOMSQLITE_XCCONFIG_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-USER.xcconfig"
-        
+
         # The path to your custom "GRDBCustomSQLite-USER.h":
         CUSTOMSQLITE_H_USER_PATH="${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-USER.h"
-        
+
         #######################################################
         #
         #######################################################
-        
-        
+
+
         if [ ! -d "$GRDB_SOURCE_PATH" ];
         then
         echo "error: Path to GRDB source (GRDB_SOURCE_PATH) missing/incorrect: $GRDB_SOURCE_PATH"
         exit 1
         fi
-        
+
         SyncFileChanges () {
             SOURCE=$1
             DESTINATIONPATH=$2
             DESTINATIONFILENAME=$3
             DESTINATION="${DESTINATIONPATH}/${DESTINATIONFILENAME}"
-            
+
             if [ ! -f "$SOURCE" ];
             then
             echo "error: Source file missing: $SOURCE"
             exit 1
             fi
-            
+
             rsync -a "$SOURCE" "$DESTINATION"
         }
-        
+
         SyncFileChanges $SQLITELIB_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom/src" "SQLiteLib-USER.xcconfig"
         SyncFileChanges $CUSTOMSQLITE_XCCONFIG_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDBCustomSQLite-USER.xcconfig"
         SyncFileChanges $CUSTOMSQLITE_H_USER_PATH "${GRDB_SOURCE_PATH}/SQLiteCustom" "GRDBCustomSQLite-USER.h"
-        
+
         echo "Finished syncing"
         ```
-        
+
         Modify the top of `GRDBCustomSQLite-INSTALL.sh` file so that it contains correct paths.
 
 5. Embed the `GRDBCustom.xcodeproj` project in your own project.
@@ -116,17 +116,21 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
 7. Add the `GRDBCustom.framework` from the targeted platform to the **Embedded Binaries** section of the **General**  tab of your **application target**.
 
 8. Add a Run Script phase for your target in the **Pre-actions** section of the **Build** tab of your **application scheme**:
-    
+
     ```sh
     source "${PROJECT_DIR}/GRDBCustomSQLite/GRDBCustomSQLite-INSTALL.sh"
     ```
-    
+
     The path should be the path to your `GRDBCustomSQLite-INSTALL.sh` file.
-    
+
     Select your application target in the "Provide build settings from" menu.
 
 9. Check the "Shared" checkbox of your application scheme (this lets you commit the pre-action in your Version Control System).
 
+10. If you have enabled "Hardened Runtime" for your target (**Build Settings**/**Signing**) then you may need to check **Disable Library Validation** under the **Hardened Runtime** section of the **Signing & Capabilities** tab.
+
+    (The build error without this exception is "Library not loaded ... different Team IDs")
+
 Now you can use GRDB with your custom SQLite build:
 
 ```swift

Documentation/DemoApps/GRDBDemo/GRDBDemo/Database/AppDatabase.swift

@@ -12,7 +12,7 @@ import os.log
 /// let dbQueue = try DatabaseQueue(configuration: config)
 /// let appDatabase = try AppDatabase(dbQueue)
 /// ```
-final class AppDatabase: Sendable {
+struct AppDatabase: Sendable {
     /// Access to the database.
     ///
     /// See <https://swiftpackageindex.com/groue/GRDB.swift/documentation/grdb/databaseconnections>
@@ -130,7 +130,7 @@ extension AppDatabase {
 
     /// Refresh all players (by performing some random changes, for demo purpose).
     func refreshPlayers() async throws {
-        try await dbWriter.write { [self] db in
+        try await dbWriter.write { db in
             if try Player.all().isEmpty(db) {
                 // When database is empty, insert new random players
                 try createRandomPlayers(db)

GRDB.swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'GRDB.swift'
-  s.version  = '7.5.0'
+  s.version  = '7.6.0'
 
   s.license  = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'A toolkit for SQLite databases, with a focus on application development.'

GRDB.xcodeproj/project.pbxproj

@@ -273,6 +273,7 @@
 		56A5EF0F1EF7F20B00F03071 /* ForeignKeyInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A5EF0E1EF7F20B00F03071 /* ForeignKeyInfoTests.swift */; };
 		56A8C2301D1914540096E9D4 /* UUID.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56A8C22F1D1914540096E9D4 /* UUID.swift */; };
 		56AACAA822ACED7100A40F2A /* Fetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AACAA722ACED7100A40F2A /* Fetch.swift */; };
+		56AC93DF2E291C4700DB6C74 /* DispatchQueueActor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AC93DE2E291C4700DB6C74 /* DispatchQueueActor.swift */; };
 		56AE64122229A53700AD1B0B /* HasOneThroughAssociation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE64112229A53700AD1B0B /* HasOneThroughAssociation.swift */; };
 		56AE6424222AAC9500AD1B0B /* AssociationHasOneThroughSQLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AE6423222AAC9500AD1B0B /* AssociationHasOneThroughSQLTests.swift */; };
 		56AFEF2F29969F6E00CA1E51 /* TransactionClock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56AFEF2E29969F6E00CA1E51 /* TransactionClock.swift */; };
@@ -769,6 +770,7 @@
 		56A8C22F1D1914540096E9D4 /* UUID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UUID.swift; sourceTree = "<group>"; };
 		56A8C2361D1914790096E9D4 /* FoundationNSUUIDTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationNSUUIDTests.swift; sourceTree = "<group>"; };
 		56AACAA722ACED7100A40F2A /* Fetch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fetch.swift; sourceTree = "<group>"; };
+		56AC93DE2E291C4700DB6C74 /* DispatchQueueActor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DispatchQueueActor.swift; sourceTree = "<group>"; };
 		56AE64112229A53700AD1B0B /* HasOneThroughAssociation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasOneThroughAssociation.swift; sourceTree = "<group>"; };
 		56AE6423222AAC9500AD1B0B /* AssociationHasOneThroughSQLTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssociationHasOneThroughSQLTests.swift; sourceTree = "<group>"; };
 		56AF746A1D41FB9C005E9FF3 /* DatabaseValueConvertibleEscapingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseValueConvertibleEscapingTests.swift; sourceTree = "<group>"; };
@@ -1595,13 +1597,13 @@
 				56A238751B9C75030082EB20 /* DatabaseValue.swift */,
 				560D923E1C672C3E00F4F92B /* DatabaseValueConvertible.swift */,
 				563363C31C942C37000BE133 /* DatabaseWriter.swift */,
+				56AC93DE2E291C4700DB6C74 /* DispatchQueueActor.swift */,
 				5636E9BB1D22574100B9B05F /* FetchRequest.swift */,
 				56A238761B9C75030082EB20 /* Row.swift */,
 				567404871CEF84C8003ED5CC /* RowAdapter.swift */,
 				566B9C1F25C6CC24004542CF /* RowDecodingError.swift */,
 				56BB6EA81D3009B100A1CA52 /* SchedulingWatchdog.swift */,
 				560A37A61C8FF6E500949E71 /* SerializedDatabase.swift */,
-				56D3331F29C38D6700430680 /* WALSnapshotTransaction.swift */,
 				56E9FAD7221053DC00C703A8 /* SQL.swift */,
 				569D6DDD220EF9E100A058A9 /* SQLInterpolation.swift */,
 				56FBFED82210731A00945324 /* SQLRequest.swift */,
@@ -1611,6 +1613,7 @@
 				56AFEF2E29969F6E00CA1E51 /* TransactionClock.swift */,
 				566B91321FA4D3810012D5B0 /* TransactionObserver.swift */,
 				56B7EE822863781300C0525F /* WALSnapshot.swift */,
+				56D3331F29C38D6700430680 /* WALSnapshotTransaction.swift */,
 				5605F1471C672E4000235C62 /* Support */,
 			);
 			path = Core;
@@ -2180,6 +2183,7 @@
 				563B8FC524A1D3B9007A48C9 /* OnDemandFuture.swift in Sources */,
 				5656A8B02295BFD7001FF3FF /* TableRecord+QueryInterfaceRequest.swift in Sources */,
 				5613ED4421A95B2C00DC7A68 /* ValueReducer.swift in Sources */,
+				56AC93DF2E291C4700DB6C74 /* DispatchQueueActor.swift in Sources */,
 				5636E9BC1D22574100B9B05F /* FetchRequest.swift in Sources */,
 				566DDE0D288D763C0000DCFB /* Fixits.swift in Sources */,
 				56BB6EA91D3009B100A1CA52 /* SchedulingWatchdog.swift in Sources */,

GRDB/Core/Database.swift

@@ -1149,7 +1149,9 @@ public final class Database: CustomStringConvertible, CustomDebugStringConvertib
 
     // See <https://www.sqlite.org/c3ref/interrupt.html>
     func interrupt() {
-        sqlite3_interrupt(sqliteConnection)
+        if let sqliteConnection {
+            sqlite3_interrupt(sqliteConnection)
+        }
     }
 
     // MARK: - Database Suspension
@@ -1223,22 +1225,31 @@ public final class Database: CustomStringConvertible, CustomDebugStringConvertib
         }
     }
 
-    /// Cancels the current database access. All statements but ROLLBACK
-    /// will throw `CancellationError`, until `uncancel()` is called.
-    ///
-    /// This method can be called from any thread.
-    func cancel() {
-        let needsInterrupt = suspensionMutex.withLock { suspension in
-            if suspension.isCancelled {
-                return false
-            }
-            
-            suspension.isCancelled = true
-            return suspension.interruptsWhenCancelled
+    /// Returns a closure that cancels the current database access.
+    /// Most statements will throw `CancellationError`, until `uncancel()`
+    /// is called.
+    var cancel: @Sendable () -> Void {
+        // Workaround the fact that SQLiteConnection is not Sendable.
+        struct Connection: @unchecked Sendable {
+            var sqliteConnection: SQLiteConnection?
         }
+        let connection = Connection(sqliteConnection: sqliteConnection)
 
-        if needsInterrupt {
-            interrupt()
+        return { [suspensionMutex, connection] in
+            let needsInterrupt = suspensionMutex.withLock { suspension in
+                if suspension.isCancelled {
+                    return false
+                }
+                
+                suspension.isCancelled = true
+                return suspension.interruptsWhenCancelled
+            }
+            
+            if needsInterrupt {
+                if let sqliteConnection = connection.sqliteConnection {
+                    sqlite3_interrupt(sqliteConnection)
+                }
+            }
         }
     }
 
@@ -1318,6 +1329,11 @@ public final class Database: CustomStringConvertible, CustomDebugStringConvertib
             return
         }
 
+        // Commits when read-only are just like rollbacks above.
+        if statement.transactionEffect == .commitTransaction && isReadOnly {
+            return
+        }
+        
         // Suspension should not prevent adjusting the read-only mode.
         // See <https://github.com/groue/GRDB.swift/issues/1715>.
         if statement.isQueryOnlyPragma {