Skip to content

Fix for @DatabaseFunction when arguments are newline separated #166

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
Sep 10, 2025
Merged

Fix for @DatabaseFunction when arguments are newline separated #166

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
2 changes: 1 addition & 1 deletion Sources/StructuredQueriesSQLiteMacros/DatabaseFunctionMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ extension DatabaseFunctionMacro: PeerMacro {
}
signature.parameterClause.parameters[index] = parameter
invocationArgumentTypes.append(type)
let parameterName = "\(parameter.secondName ?? parameter.firstName)"
let parameterName = (parameter.secondName ?? parameter.firstName).trimmedDescription
parameters.append(parameterName)
argumentBindings.append((parameterName, "\(type)(queryBinding: arguments[\(offset)])"))
}
Expand Down
113 changes: 113 additions & 0 deletions Tests/StructuredQueriesMacrosTests/DatabaseFunctionMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,5 +967,118 @@ extension SnapshotTests {
"""#
}
}

@Test func formatting() {
assertMacro {
"""
@DatabaseFunction
func min(
_ x: Int,
_ y: Int
) {
Swift.min(x, y)
}
"""
} expansion: {
#"""
func min(
_ x: Int,
_ y: Int
) {
Swift.min(x, y)
}

var $min: __macro_local_3minfMu_ {
__macro_local_3minfMu_(min)
}

struct __macro_local_3minfMu_: StructuredQueriesSQLiteCore.ScalarDatabaseFunction {
public typealias Input = (Int, Int)
public typealias Output = Swift.Void
public let name = "min"
public let argumentCount: Int? = 2
public let isDeterministic = false
public let body: (Int, Int) -> Swift.Void
public init(_ body: @escaping (Int, Int) -> Swift.Void) {
self.body = body
}
public func callAsFunction(
_ x: some StructuredQueriesCore.QueryExpression<Int>,
_ y: some StructuredQueriesCore.QueryExpression<Int>
) -> some StructuredQueriesCore.QueryExpression<Swift.Void> {
StructuredQueriesCore.SQLQueryExpression(
"\(quote: self.name)(\(x), \(y))"
)
}
public func invoke(
_ arguments: [StructuredQueriesCore.QueryBinding]
) -> StructuredQueriesCore.QueryBinding {
guard self.argumentCount == nil || self.argumentCount == arguments.count, let x = Int(queryBinding: arguments[0]), let y = Int(queryBinding: arguments[1]) else {
return .invalid(InvalidInvocation())
}
self.body(x.queryOutput, y.queryOutput)
return .null
}
private struct InvalidInvocation: Error {
}
}
"""#
}
assertMacro {
"""
@DatabaseFunction
func min(
x: Int,
y: Int
) {
Swift.min(x, y)
}
"""
} expansion: {
#"""
func min(
x: Int,
y: Int
) {
Swift.min(x, y)
}

var $min: __macro_local_3minfMu_ {
__macro_local_3minfMu_(min)
}

struct __macro_local_3minfMu_: StructuredQueriesSQLiteCore.ScalarDatabaseFunction {
public typealias Input = (Int, Int)
public typealias Output = Swift.Void
public let name = "min"
public let argumentCount: Int? = 2
public let isDeterministic = false
public let body: (Int, Int) -> Swift.Void
public init(_ body: @escaping (Int, Int) -> Swift.Void) {
self.body = body
}
public func callAsFunction(
x: some StructuredQueriesCore.QueryExpression<Int>,
y: some StructuredQueriesCore.QueryExpression<Int>
) -> some StructuredQueriesCore.QueryExpression<Swift.Void> {
StructuredQueriesCore.SQLQueryExpression(
"\(quote: self.name)(\(x), \(y))"
)
}
public func invoke(
_ arguments: [StructuredQueriesCore.QueryBinding]
) -> StructuredQueriesCore.QueryBinding {
guard self.argumentCount == nil || self.argumentCount == arguments.count, let x = Int(queryBinding: arguments[0]), let y = Int(queryBinding: arguments[1]) else {
return .invalid(InvalidInvocation())
}
self.body(x.queryOutput, y.queryOutput)
return .null
}
private struct InvalidInvocation: Error {
}
}
"""#
}
}
}
}