Skip to content

Commit 2d31ed4

Browse files
committed
Merge branch 'development'
2 parents 19b0b6a + 5e7b604 commit 2d31ed4

File tree

68 files changed

+1411
-1358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1411
-1358
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
#### 6.x Releases
99

10-
- `6.3.x` Releases - [6.3.0](#630)
10+
- `6.3.x` Releases - [6.3.0](#630) - [6.3.1](#631)
1111
- `6.2.x` Releases - [6.2.0](#620)
1212
- `6.1.x` Releases - [6.1.0](#610)
1313
- `6.0.x` Releases - [6.0.0](#600)
@@ -101,6 +101,12 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
101101

102102
---
103103

104+
## 6.3.1
105+
106+
Released November 11, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.3.0...v6.3.1)
107+
108+
- **New**: DocC documentation is hosted at https://swiftpackageindex.com/groue/GRDB.swift/documentation
109+
104110
## 6.3.0
105111

106112
Released November 6, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.2.0...v6.3.0)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Sharing a Database in an App Group Container
22
============================================
33

4-
This guide [has moved](SharingADatabase.md).
4+
This guide [has moved](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasesharing).

Documentation/AssociationsBasics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2963,7 +2963,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29632963
[Further Refinements to Associations]: #further-refinements-to-associations
29642964
[The Types of Associations]: #the-types-of-associations
29652965
[FetchableRecord]: ../README.md#fetchablerecord-protocols
2966-
[migration]: https://groue.github.io/GRDB.swift/docs/6.3/documentation/grdb/migrations
2966+
[migration]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/migrations
29672967
[Record]: ../README.md#records
29682968
[Foreign Key Actions]: https://sqlite.org/foreignkeys.html#fk_actions
29692969
[Associations and the Database Schema]: #associations-and-the-database-schema

Documentation/Combine.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ let newPlayerCount = dbQueue.writePublisher { db -> Int in
191191

192192
The difference is that the last fetches are performed in the `thenRead` function. This function accepts two arguments: a readonly database connection, and the result of the `updates` function. This allows you to pass information from a function to the other (it is ignored in the sample code above).
193193

194-
When you use a [database pool], this method applies a scheduling optimization: the `thenRead` function sees the database in the state left by the `updates` function, and yet does not block any concurrent writes. This can reduce database write contention. See [Advanced DatabasePool](Concurrency.md#advanced-databasepool) for more information.
194+
When you use a [database pool], this method applies a scheduling optimization: the `thenRead` function sees the database in the state left by the `updates` function, and yet does not block any concurrent writes. This can reduce database write contention.
195195

196196
When you use a [database queue], the results are guaranteed to be identical, but no scheduling optimization is applied.
197197

@@ -398,9 +398,9 @@ let cancellable = hallOfFamePublisher.sink(
398398
[`readPublisher(receiveOn:value:)`]: #databasereaderreadpublisherreceiveonvalue
399399
[`writePublisher(receiveOn:updates:)`]: #databasewriterwritepublisherreceiveonupdates
400400
[`writePublisher(receiveOn:updates:thenRead:)`]: #databasewriterwritepublisherreceiveonupdatesthenread
401-
[`migratePublisher(_:receiveOn:)`]: https://groue.github.io/GRDB.swift/docs/6.3/documentation/grdb/databasemigrator/migratepublisher(_:receiveon:)
401+
[`migratePublisher(_:receiveOn:)`]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasemigrator/migratepublisher(_:receiveon:)
402402
[configured]: ../README.md#databasepool-configuration
403403
[database pool]: ../README.md#database-pools
404404
[database queue]: ../README.md#database-queues
405-
[database snapshot]: Concurrency.md#database-snapshots
405+
[database snapshot]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasesnapshot
406406
[scheduler]: https://developer.apple.com/documentation/combine/scheduler

0 commit comments

Comments
 (0)