Skip to content

Commit ceb3884

Browse files
committed
Refine upsert action naming
1 parent aa13b08 commit ceb3884

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

Sources/SQLiteData/CloudKit/SyncEngine.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,14 +1961,14 @@
19611961
do {
19621962
switch try actionForUpsert(
19631963
from: serverRecord,
1964-
in: table,
1964+
table: table,
19651965
metadata: metadata,
19661966
force: force,
19671967
db: db
19681968
) {
19691969
case .skip:
19701970
return
1971-
case .upsert:
1971+
case .apply:
19721972
try $_currentZoneID.withValue(serverRecord.recordID.zoneID) {
19731973
try #sql(upsert(
19741974
table,
@@ -2025,19 +2025,19 @@
20252025
/// The record matches the last-known server record and there is nothing to apply.
20262026
case skip
20272027
/// The server-side change applies directly.
2028-
case upsert
2028+
case apply
20292029
/// Both sides hold conflicting state that must be resolved before applying.
20302030
case resolve(any RowConflict<T>)
20312031
}
20322032

20332033
private func actionForUpsert<T>(
20342034
from serverRecord: CKRecord,
2035-
in table: some SynchronizableTable<T>,
2035+
table: some SynchronizableTable<T>,
20362036
metadata: SyncMetadata,
20372037
force: Bool,
20382038
db: Database
20392039
) throws -> ServerRecordUpsertAction<T> {
2040-
guard !force else { return .upsert }
2040+
guard !force else { return .apply }
20412041

20422042
func clientRow() throws -> T? {
20432043
guard let row = try T.unscoped
@@ -2049,7 +2049,7 @@
20492049
}
20502050

20512051
guard let ancestorRecord = metadata._lastKnownServerRecordAllFields else {
2052-
guard let clientRow = try clientRow() else { return .upsert }
2052+
guard let clientRow = try clientRow() else { return .apply }
20532053

20542054
let clientVersion = RowVersion(
20552055
clientRow: clientRow,
@@ -2075,9 +2075,9 @@
20752075
guard hasServerChanged else { return .skip }
20762076

20772077
let hasClientChanged = metadata.userModificationTime > ancestorRecord.userModificationTime
2078-
guard hasClientChanged else { return .upsert }
2078+
guard hasClientChanged else { return .apply }
20792079

2080-
guard let clientRow = try clientRow() else { return .upsert }
2080+
guard let clientRow = try clientRow() else { return .apply }
20812081

20822082
let ancestorVersion = try RowVersion<T>(from: ancestorRecord, db: db)
20832083
let serverVersion = try RowVersion<T>(from: serverRecord, db: db)

0 commit comments

Comments
 (0)