Skip to content

An alternate implementation of excluded conflict resolution #100

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
stephencelis merged 1 commit into from
Jul 11, 2025
Merged

An alternate implementation of excluded conflict resolution #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Sources/StructuredQueriesCore/Documentation.docc/Extensions/Update.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@

- ``UpdateOf``
- ``Updates``
- ``UpdatesOf``
- ``ConflictResolution``
14 changes: 7 additions & 7 deletions Sources/StructuredQueriesCore/Internal/Deprecations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extension Table {
public static func insert(
or conflictResolution: ConflictResolution? = nil,
_ row: Self,
onConflict doUpdate: ((inout Updates<Self, Excluded>) -> Void)? = nil
onConflict doUpdate: ((inout Updates<Self>) -> Void)? = nil
) -> InsertOf<Self> {
insert(or: conflictResolution, [row], onConflict: doUpdate)
}
Expand All @@ -56,7 +56,7 @@ extension Table {
public static func insert(
or conflictResolution: ConflictResolution? = nil,
_ rows: [Self],
onConflict doUpdate: ((inout Updates<Self, Excluded>) -> Void)? = nil
onConflict doUpdate: ((inout Updates<Self>) -> Void)? = nil
) -> InsertOf<Self> {
insert(or: conflictResolution, values: { rows }, onConflict: doUpdate)
}
Expand All @@ -66,7 +66,7 @@ extension Table {
or conflictResolution: ConflictResolution? = nil,
_ columns: (TableColumns) -> TableColumns = { $0 },
@InsertValuesBuilder<Self> values: () -> [Self],
onConflict updates: ((inout Updates<Self, Excluded>) -> Void)?
onConflict updates: ((inout Updates<Self>) -> Void)?
) -> InsertOf<Self> {
insert(or: conflictResolution, columns, values: values, onConflictDoUpdate: updates)
}
Expand All @@ -77,7 +77,7 @@ extension Table {
_ columns: (TableColumns) -> (TableColumn<Self, V1>, repeat TableColumn<Self, each V2>),
@InsertValuesBuilder<(V1.QueryOutput, repeat (each V2).QueryOutput)>
values: () -> [(V1.QueryOutput, repeat (each V2).QueryOutput)],
onConflict updates: ((inout Updates<Self, Excluded>) -> Void)?
onConflict updates: ((inout Updates<Self>) -> Void)?
) -> InsertOf<Self> {
insert(or: conflictResolution, columns, values: values, onConflictDoUpdate: updates)
}
Expand All @@ -89,7 +89,7 @@ extension Table {
or conflictResolution: ConflictResolution? = nil,
_ columns: (TableColumns) -> (TableColumn<Self, V1>, repeat TableColumn<Self, each V2>),
select selection: () -> Select<(V1, repeat each V2), From, Joins>,
onConflict updates: ((inout Updates<Self, Excluded>) -> Void)?
onConflict updates: ((inout Updates<Self>) -> Void)?
) -> InsertOf<Self> {
insert(or: conflictResolution, columns, select: selection, onConflictDoUpdate: updates)
}
Expand All @@ -102,7 +102,7 @@ extension PrimaryKeyedTable {
public static func insert(
or conflictResolution: ConflictResolution? = nil,
_ row: Draft,
onConflict updates: ((inout Updates<Self, Excluded>) -> Void)? = nil
onConflict updates: ((inout Updates<Self>) -> Void)? = nil
) -> InsertOf<Self> {
insert(or: conflictResolution, values: { row }, onConflictDoUpdate: updates)
}
Expand All @@ -113,7 +113,7 @@ extension PrimaryKeyedTable {
public static func insert(
or conflictResolution: ConflictResolution? = nil,
_ rows: [Draft],
onConflict updates: ((inout Updates<Self, Excluded>) -> Void)? = nil
onConflict updates: ((inout Updates<Self>) -> Void)? = nil
) -> InsertOf<Self> {
insert(or: conflictResolution, values: { rows }, onConflictDoUpdate: updates)
}
Expand Down
Loading