Skip to content

Fix macro-generated code for enum selections #208

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
merged 1 commit into from
Oct 10, 2025
Merged

Fix macro-generated code for enum selections #208

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
12 changes: 6 additions & 6 deletions Sources/StructuredQueriesMacros/TableMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ extension TableMacro: MemberMacro {
[(name: TokenSyntax, firstName: TokenSyntax, type: TypeSyntax?, default: ExprSyntax?)] = []
var allColumnNames: [TokenSyntax] = []
var writableColumns: [TokenSyntax] = []
var selectedColumns: [TokenSyntax] = []
var selectedColumns: [(name: TokenSyntax, type: TypeSyntax?)] = []
var columnsProperties: [DeclSyntax] = []
var expansionFailed = false

Expand Down Expand Up @@ -1045,7 +1045,7 @@ extension TableMacro: MemberMacro {
)
}

selectedColumns.append(identifier)
selectedColumns.append((identifier, columnQueryValueType))

if !isGenerated {
// NB: A compiler bug prevents us from applying the '@_Draft' macro directly
Expand Down Expand Up @@ -1190,7 +1190,7 @@ extension TableMacro: MemberMacro {

let selectionAssignment =
selectedColumns
.map { "allColumns.append(contentsOf: \($0)._allColumns)\n" }
.map { c, _ in "allColumns.append(contentsOf: \(c)._allColumns)\n" }
.joined()

selectionInitializers.append(
Expand Down Expand Up @@ -1268,7 +1268,7 @@ extension TableMacro: MemberMacro {
}
}

selectedColumns.append(identifier)
selectedColumns.append((identifier, columnQueryValueType))

let defaultValue = parameter.defaultValue?.value.rewritten(selfRewriter)
let tableColumnType =
Expand Down Expand Up @@ -1312,7 +1312,7 @@ extension TableMacro: MemberMacro {
argument.append(" = \(type)(queryOutput: \(defaultValue))")
}
let staticColumns = selectedColumns.map {
$0 == identifier ? "\($0)" : "\(valueType)?(queryOutput: nil)" as ExprSyntax
$0 == identifier ? "\($0)" : "\($1)?(queryOutput: nil)" as ExprSyntax
}
let staticInitialization =
staticColumns
Expand Down Expand Up @@ -1469,7 +1469,7 @@ extension TableMacro: MemberMacro {
\(raw: writableColumnsAssignment)return writableColumns
}
public var queryFragment: QueryFragment {
"\(raw: selectedColumns.map { #"\(self.\#($0))"# }.joined(separator: ", "))"
"\(raw: selectedColumns.map { c, _ in #"\(self.\#(c))"# }.joined(separator: ", "))"
}
}
""",
Expand Down
56 changes: 36 additions & 20 deletions Tests/StructuredQueriesMacrosTests/TableMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2453,22 +2453,22 @@ extension SnapshotTests {
}
}

public struct Selection: StructuredQueriesCore.TableExpression {
public nonisolated struct Selection: StructuredQueriesCore.TableExpression {
public typealias QueryValue = Post
public let allColumns: [any StructuredQueriesCore.QueryExpression]
public static func photo(
_ photo: some StructuredQueriesCore.QueryExpression<Photo>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: photo._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
return Self(allColumns: allColumns)
}
public static func note(
_ note: some StructuredQueriesCore.QueryExpression<String>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: note._allColumns)
return Self(allColumns: allColumns)
}
Expand All @@ -2482,7 +2482,10 @@ extension SnapshotTests {
TableColumns()
}
public nonisolated static var _columnWidth: Int {
[Photo._columnWidth, String._columnWidth].reduce(0, +)
var columnWidth = 0
columnWidth += Photo._columnWidth
columnWidth += String._columnWidth
return columnWidth
}
public nonisolated static var tableName: String {
"posts"
Expand Down Expand Up @@ -2557,22 +2560,22 @@ extension SnapshotTests {
}
}

public struct Selection: StructuredQueriesCore.TableExpression {
public nonisolated struct Selection: StructuredQueriesCore.TableExpression {
public typealias QueryValue = Post
public let allColumns: [any StructuredQueriesCore.QueryExpression]
public static func photo(
_ photo: some StructuredQueriesCore.QueryExpression<Photo>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: photo._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
return Self(allColumns: allColumns)
}
public static func note(
_ note: some StructuredQueriesCore.QueryExpression<String>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: note._allColumns)
return Self(allColumns: allColumns)
}
Expand All @@ -2586,7 +2589,10 @@ extension SnapshotTests {
TableColumns()
}
public nonisolated static var _columnWidth: Int {
[Photo._columnWidth, String._columnWidth].reduce(0, +)
var columnWidth = 0
columnWidth += Photo._columnWidth
columnWidth += String._columnWidth
return columnWidth
}
public nonisolated static var tableName: String {
"posts"
Expand Down Expand Up @@ -2657,22 +2663,22 @@ extension SnapshotTests {
}
}

public struct Selection: StructuredQueriesCore.TableExpression {
public nonisolated struct Selection: StructuredQueriesCore.TableExpression {
public typealias QueryValue = Post
public let allColumns: [any StructuredQueriesCore.QueryExpression]
public static func photo(
_ photo: some StructuredQueriesCore.QueryExpression<Photo>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: photo._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
return Self(allColumns: allColumns)
}
public static func note(
_ note: some StructuredQueriesCore.QueryExpression<String>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: note._allColumns)
return Self(allColumns: allColumns)
}
Expand All @@ -2686,7 +2692,10 @@ extension SnapshotTests {
TableColumns()
}
public nonisolated static var _columnWidth: Int {
[Photo._columnWidth, String._columnWidth].reduce(0, +)
var columnWidth = 0
columnWidth += Photo._columnWidth
columnWidth += String._columnWidth
return columnWidth
}
public nonisolated static var tableName: String {
"posts"
Expand Down Expand Up @@ -2742,22 +2751,22 @@ extension SnapshotTests {
}
}

public struct Selection: StructuredQueriesCore.TableExpression {
public nonisolated struct Selection: StructuredQueriesCore.TableExpression {
public typealias QueryValue = Post
public let allColumns: [any StructuredQueriesCore.QueryExpression]
public static func photo(
_ photo: some StructuredQueriesCore.QueryExpression<Photo>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: photo._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
return Self(allColumns: allColumns)
}
public static func note(
text note: some StructuredQueriesCore.QueryExpression<String>
) -> Self {
var allColumns: [any StructuredQueriesCore.QueryExpression] = []
allColumns.append(contentsOf: String?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: Photo?(queryOutput: nil)._allColumns)
allColumns.append(contentsOf: note._allColumns)
return Self(allColumns: allColumns)
}
Expand All @@ -2771,7 +2780,10 @@ extension SnapshotTests {
TableColumns()
}
public nonisolated static var _columnWidth: Int {
[Photo._columnWidth, String._columnWidth].reduce(0, +)
var columnWidth = 0
columnWidth += Photo._columnWidth
columnWidth += String._columnWidth
return columnWidth
}
public nonisolated static var tableName: String {
"posts"
Expand Down Expand Up @@ -2823,7 +2835,7 @@ extension SnapshotTests {
}
}

public struct Selection: StructuredQueriesCore.TableExpression {
public nonisolated struct Selection: StructuredQueriesCore.TableExpression {
public typealias QueryValue = Post
public let allColumns: [any StructuredQueriesCore.QueryExpression]
public static func note(
Expand All @@ -2843,7 +2855,9 @@ extension SnapshotTests {
TableColumns()
}
public nonisolated static var _columnWidth: Int {
[String._columnWidth].reduce(0, +)
var columnWidth = 0
columnWidth += String._columnWidth
return columnWidth
}
public nonisolated static var tableName: String {
"posts"
Expand Down Expand Up @@ -2893,7 +2907,7 @@ extension SnapshotTests {
}
}

public struct Selection: StructuredQueriesCore.TableExpression {
public nonisolated struct Selection: StructuredQueriesCore.TableExpression {
public typealias QueryValue = Post
public let allColumns: [any StructuredQueriesCore.QueryExpression]
public static func timestamp(
Expand All @@ -2913,7 +2927,9 @@ extension SnapshotTests {
TableColumns()
}
public nonisolated static var _columnWidth: Int {
[Date.UnixTimeRepresentation._columnWidth].reduce(0, +)
var columnWidth = 0
columnWidth += Date.UnixTimeRepresentation._columnWidth
return columnWidth
}
public nonisolated static var tableName: String {
"posts"
Expand Down
38 changes: 38 additions & 0 deletions Tests/StructuredQueriesTests/EnumTableTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,44 @@
"""
}
}

@Test func selection() {
assertQuery(
Values(
Attachment.Kind.Selection.note("Hello, world!")
)
) {
"""
SELECT NULL AS "link", 'Hello, world!' AS "note", NULL AS "videoURL", NULL AS "videoKind", NULL AS "imageCaption", NULL AS "imageURL"
"""
} results: {
"""
┌───────────────────────────────────────┐
│ Attachment.Kind.note("Hello, world!") │
└───────────────────────────────────────┘
"""
}
assertQuery(
Values(
Attachment.Kind.Selection.image(Attachment.Image(caption: "Blob", url: URL(string: "https://pointfree.co")!))
)
) {
"""
SELECT NULL AS "link", NULL AS "note", NULL AS "videoURL", NULL AS "videoKind", 'Blob', 'https://pointfree.co' AS "imageCaption"
"""
} results: {
"""
┌────────────────────────────────────┐
│ Attachment.Kind.image( │
│ Attachment.Image( │
│ caption: "Blob", │
│ url: URL(https://pointfree.co) │
│ ) │
│ ) │
└────────────────────────────────────┘
"""
}
}
}
}

Expand Down