Skip to content

Commit 8ba1bc9

Browse files
committed
Merge branch 'development'
2 parents c5283a0 + c4e3928 commit 8ba1bc9

File tree

6 files changed

+12
-4
lines changed

6 files changed

+12
-4
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
77

88
#### 7.x Releases
99

10-
- `7.6.x` Releases - [7.6.0](#760)
10+
- `7.6.x` Releases - [7.6.0](#760) - [7.6.1](#761)
1111
- `7.5.x` Releases - [7.5.0](#750)
1212
- `7.4.x` Releases - [7.4.0](#740) - [7.4.1](#741)
1313
- `7.3.x` Releases - [7.3.0](#730)
@@ -138,6 +138,12 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
138138

139139
---
140140

141+
## 7.6.1
142+
143+
Released July 23, 2025
144+
145+
- **Fixed**: Fix race condition regarding Task cancellation by [@groue](https://github.com/groue) in [#1797](https://github.com/groue/GRDB.swift/pull/1797)
146+
141147
## 7.6.0
142148

143149
Released July 20, 2025

GRDB.swift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GRDB.swift'
3-
s.version = '7.6.0'
3+
s.version = '7.6.1'
44

55
s.license = { :type => 'MIT', :file => 'LICENSE' }
66
s.summary = 'A toolkit for SQLite databases, with a focus on application development.'

GRDB/Core/DatabasePool.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,7 @@ extension DatabasePool: DatabaseWriter {
803803
try Task.checkCancellation()
804804
return try writer.sync { db in
805805
defer {
806+
cancelMutex.store(nil)
806807
db.uncancel()
807808
}
808809
cancelMutex.store(db.cancel)

GRDB/Core/SerializedDatabase.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ final class SerializedDatabase {
256256
return try await withTaskCancellationHandler {
257257
try await actor.execute {
258258
defer {
259+
cancelMutex.store(nil)
259260
db.uncancel()
260261
preconditionNoUnsafeTransactionLeft(db)
261262
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<a href="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml"><img alt="CI Status" src="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml/badge.svg?branch=master"></a>
1616
</p>
1717

18-
**Latest release**: July 20, 2025 • [version 7.6.0](https://github.com/groue/GRDB.swift/tree/v7.6.0) • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md)
18+
**Latest release**: July 23, 2025 • [version 7.6.1](https://github.com/groue/GRDB.swift/tree/v7.6.1) • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md)
1919

2020
**Requirements**: iOS 13.0+ / macOS 10.15+ / tvOS 13.0+ / watchOS 7.0+ &bull; SQLite 3.20.0+ &bull; Swift 6+ / Xcode 16+
2121

Support/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>7.6.0</string>
18+
<string>7.6.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)