Skip to content

Delete CK record when updating primary key. #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbrandonw merged 3 commits into from
Sep 2, 2025
Merged

Delete CK record when updating primary key. #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd980cf
Delete CK record when updating primary key.
mbrandonw Sep 2, 2025
3b6a1a5
wip
mbrandonw Sep 2, 2025
032acbf
wip
mbrandonw Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Sources/SharingGRDBCore/CloudKit/Triggers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,28 @@
afterUpdate(parentForeignKey: parentForeignKey),
afterDeleteFromUser(parentForeignKey: parentForeignKey),
afterDeleteFromSyncEngine,
afterPrimaryKeyChange(parentForeignKey: parentForeignKey),
]
}

fileprivate static func afterPrimaryKeyChange(parentForeignKey: ForeignKey?) -> TemporaryTrigger<Self> {
createTemporaryTrigger(
"\(String.sqliteDataCloudKitSchemaName)_after_primary_key_change_on_\(tableName)",
ifNotExists: true,
after: .update(of: \.primaryKey) { old, new in
checkWritePermissions(alias: new, parentForeignKey: parentForeignKey)
SyncMetadata
.where {
$0.recordPrimaryKey.eq(SQLQueryExpression("\(old.primaryKey)"))
&& $0.recordType.eq(tableName)
}
.update { $0._isDeleted = true }
} when: { old, new in
old.primaryKey.neq(new.primaryKey)
}
)
}

fileprivate static func afterInsert(parentForeignKey: ForeignKey?) -> TemporaryTrigger<Self> {
createTemporaryTrigger(
"\(String.sqliteDataCloudKitSchemaName)_after_insert_on_\(tableName)",
Expand Down
2 changes: 1 addition & 1 deletion Sources/SharingGRDBCore/Internal/UserDatabase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Dependencies
import GRDB

package struct UserDatabase {
private let database: any DatabaseWriter
package let database: any DatabaseWriter
package init(database: any DatabaseWriter) {
self.database = database
}
Expand Down
10 changes: 5 additions & 5 deletions Tests/SharingGRDBTests/CloudKitTests/AccountLifecycleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,26 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:reminders/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:reminders/zone/__defaultOwner__),
Copy link
Copy Markdown
Member Author

@mbrandonw mbrandonw Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of churn in this PR because we shortened the default zone name in tests.

recordType: "reminders",
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__)),
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__)),
share: nil,
id: 1,
isCompleted: 0,
remindersListID: 1,
title: "Get milk"
),
[1]: CKRecord(
recordID: CKRecord.ID(1:remindersListPrivates/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersListPrivates/zone/__defaultOwner__),
recordType: "remindersListPrivates",
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__)),
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__)),
share: nil,
id: 1,
position: 0,
remindersListID: 1
),
[2]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down
12 changes: 6 additions & 6 deletions Tests/SharingGRDBTests/CloudKitTests/AssetsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersListAssets/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersListAssets/zone/__defaultOwner__),
recordType: "remindersListAssets",
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__)),
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__)),
share: nil,
id: 1,
remindersListID: 1,
Expand All @@ -45,7 +45,7 @@ extension BaseCloudKitTests {
)
),
[1]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -89,9 +89,9 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersListAssets/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersListAssets/zone/__defaultOwner__),
recordType: "remindersListAssets",
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__)),
parent: CKReference(recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__)),
share: nil,
id: 1,
remindersListID: 1,
Expand All @@ -101,7 +101,7 @@ extension BaseCloudKitTests {
)
),
[1]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down
28 changes: 14 additions & 14 deletions Tests/SharingGRDBTests/CloudKitTests/CloudKitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -515,7 +515,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -597,7 +597,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -632,7 +632,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -687,7 +687,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -738,7 +738,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -783,7 +783,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -816,7 +816,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -866,7 +866,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -899,7 +899,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:remindersLists/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__),
recordType: "remindersLists",
parent: nil,
share: nil,
Expand Down Expand Up @@ -987,14 +987,14 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(fun:tags/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(fun:tags/zone/__defaultOwner__),
recordType: "tags",
parent: nil,
share: nil,
title: "fun"
),
[1]: CKRecord(
recordID: CKRecord.ID(weekend:tags/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(weekend:tags/zone/__defaultOwner__),
recordType: "tags",
parent: nil,
share: nil,
Expand Down Expand Up @@ -1028,7 +1028,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:modelAs/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:modelAs/zone/__defaultOwner__),
recordType: "modelAs",
parent: nil,
share: nil,
Expand Down Expand Up @@ -1057,7 +1057,7 @@ extension BaseCloudKitTests {
databaseScope: .private,
storage: [
[0]: CKRecord(
recordID: CKRecord.ID(1:modelAs/co.pointfree.SQLiteData.defaultZone/__defaultOwner__),
recordID: CKRecord.ID(1:modelAs/zone/__defaultOwner__),
recordType: "modelAs",
parent: nil,
share: nil,
Expand Down
Loading
Loading