Skip to content

Commit 7cd2a45

Browse files
authored
Merge pull request #1807 from emmanuel-ferdman/development
Update `GRDB7MigrationGuide.md` reference
2 parents 37065fb + 2698c55 commit 7cd2a45

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ Documentation
335335
- [Unicode](#unicode)
336336
- [Memory Management](#memory-management)
337337
- [Data Protection](https://swiftpackageindex.com/groue/GRDB.swift/documentation/grdb/databaseconnections)
338-
- :bulb: [Migrating From GRDB 6 to GRDB 7](Documentation/Documentation/GRDB7MigrationGuide.md)
338+
- :bulb: [Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md)
339339
- :bulb: [Why Adopt GRDB?](Documentation/WhyAdoptGRDB.md)
340340
- :bulb: [Recommended Practices for Designing Record Types](https://swiftpackageindex.com/groue/GRDB.swift/documentation/grdb/recordrecommendedpractices)
341341

@@ -2194,7 +2194,7 @@ For more information about batch updates, see [Update Requests](#update-requests
21942194

21952195
> **Note**: Upsert apis are available from SQLite 3.35.0+: iOS 15.0+, macOS 12.0+, tvOS 15.0+, watchOS 8.0+, or with a [custom SQLite build] or [SQLCipher](#encryption).
21962196
>
2197-
> **Note**: With regard to [persistence callbacks](#available-callbacks), an upsert behaves exactly like an insert. In particular: the `aroundInsert(_:)` and `didInsert(_:)` callbacks reports the rowid of the inserted or updated row; `willUpdate`, `aroundUdate`, `didUdate` are not called.
2197+
> **Note**: With regard to [persistence callbacks](#available-callbacks), an upsert behaves exactly like an insert. In particular: the `aroundInsert(_:)` and `didInsert(_:)` callbacks reports the rowid of the inserted or updated row; `willUpdate`, `aroundUpdate`, `didUpdate` are not called.
21982198

21992199
[PersistableRecord] provides three upsert methods:
22002200

@@ -3008,7 +3008,7 @@ try player.insert(db)
30083008
> // INSERT OR IGNORE INTO player ... RETURNING *
30093009
> do {
30103010
> let insertedPlayer = try player.insertAndFetch(db) {
3011-
> // Succesful insertion
3011+
> // Successful insertion
30123012
> catch RecordError.recordNotFound {
30133013
> // Failed insertion due to IGNORE policy
30143014
> }

0 commit comments

Comments
 (0)