Skip to content

Relax INSERT-SELECT to work with partial select statements #89

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
Jun 19, 2025
Merged

Relax INSERT-SELECT to work with partial select statements #89

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
14 changes: 4 additions & 10 deletions Sources/StructuredQueriesCore/Statements/Insert.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,11 @@ extension Table {
V1,
each V2,
C1: QueryExpression,
each C2: QueryExpression,
From,
Joins
each C2: QueryExpression
>(
or conflictResolution: ConflictResolution? = nil,
_ columns: (TableColumns) -> (TableColumn<Self, V1>, repeat TableColumn<Self, each V2>),
select selection: () -> Select<(C1, repeat each C2), From, Joins>,
select selection: () -> some PartialSelectStatement<(C1, repeat each C2)>,
onConflictDoUpdate updates: ((inout Updates<Self>) -> Void)? = nil,
@QueryFragmentBuilder<Bool>
where updateFilter: (TableColumns) -> [QueryFragment] = { _ in [] }
Expand Down Expand Up @@ -346,14 +344,12 @@ extension Table {
each V2,
C1: QueryExpression,
each C2: QueryExpression,
From,
Joins,
T1,
each T2
>(
or conflictResolution: ConflictResolution? = nil,
_ columns: (TableColumns) -> (TableColumn<Self, V1>, repeat TableColumn<Self, each V2>),
select selection: () -> Select<(C1, repeat each C2), From, Joins>,
select selection: () -> some PartialSelectStatement<(C1, repeat each C2)>,
onConflict conflictTargets: (TableColumns) -> (
TableColumn<Self, T1>, repeat TableColumn<Self, each T2>
),
Expand All @@ -380,13 +376,11 @@ extension Table {
private static func _insert<
each Value,
each ResultColumn: QueryExpression,
From,
Joins,
each ConflictTarget
>(
or conflictResolution: ConflictResolution? = nil,
_ columns: (TableColumns) -> (repeat TableColumn<Self, each Value>),
select selection: () -> Select<(repeat each ResultColumn), From, Joins>,
select selection: () -> some PartialSelectStatement<(repeat each ResultColumn)>,
onConflict conflictTargets: (TableColumns) -> (repeat TableColumn<Self, each ConflictTarget>)?,
@QueryFragmentBuilder<Bool>
where targetFilter: (TableColumns) -> [QueryFragment] = { _ in [] },
Expand Down
25 changes: 25 additions & 0 deletions Tests/StructuredQueriesTests/InsertTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,31 @@ extension SnapshotTests {
└─────────────────────┘
"""
}

assertQuery(
Tag.insert {
$0.title
} select: {
Values("vacation")
}
.returning(\.self)
) {
"""
INSERT INTO "tags"
("title")
SELECT 'vacation'
RETURNING "id", "title"
"""
} results: {
"""
┌─────────────────────┐
│ Tag( │
│ id: 8, │
│ title: "vacation" │
│ ) │
└─────────────────────┘
"""
}
}

@Test func draft() {
Expand Down