Skip to content

Commit ec069ab

Browse files
committed
Made watching tables optional
1 parent bb84701 commit ec069ab

2 files changed

Lines changed: 22 additions & 17 deletions

File tree

Sources/Compiler/Gen/SwiftLanguage.swift

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,10 @@ public struct SwiftLanguage: Language {
164164
),
165165
leftParen: .leftParenToken(),
166166
arguments: LabeledExprListSyntax {
167+
let hasWatchingTables = query.isReadOnly
168+
167169
LabeledExprSyntax(
168-
leadingTrivia: .newline,
170+
leadingTrivia: hasWatchingTables ? .newline : nil,
169171
label: nil,
170172
colon: nil,
171173
expression: DeclReferenceExprSyntax(
@@ -174,26 +176,29 @@ public struct SwiftLanguage: Language {
174176
trailingComma: TokenSyntax.commaToken()
175177
)
176178
LabeledExprSyntax(
177-
leadingTrivia: .newline,
179+
leadingTrivia: hasWatchingTables ? .newline : nil,
178180
label: TokenSyntax.identifier("in"),
179181
colon: TokenSyntax.colonToken(),
180182
expression: DeclReferenceExprSyntax(baseName: .identifier("connection")),
181-
trailingComma: TokenSyntax.commaToken()
183+
trailingComma: hasWatchingTables ? TokenSyntax.commaToken() : nil
182184
)
183-
LabeledExprSyntax(
184-
leadingTrivia: .newline,
185-
label: TokenSyntax.identifier("watchingTables"),
186-
colon: TokenSyntax.colonToken(),
187-
expression: ArrayExprSyntax {
188-
if query.isReadOnly {
189-
for table in query.usedTableNames {
190-
ArrayElementSyntax(expression: StringLiteralExprSyntax(content: table.description))
185+
186+
if hasWatchingTables {
187+
LabeledExprSyntax(
188+
leadingTrivia: .newline,
189+
label: TokenSyntax.identifier("watchingTables"),
190+
colon: TokenSyntax.colonToken(),
191+
expression: ArrayExprSyntax {
192+
if query.isReadOnly {
193+
for table in query.usedTableNames {
194+
ArrayElementSyntax(expression: StringLiteralExprSyntax(content: table.description))
195+
}
191196
}
192-
}
193-
},
194-
trailingComma: nil,
195-
trailingTrivia: .newline
196-
)
197+
},
198+
trailingComma: nil,
199+
trailingTrivia: .newline
200+
)
201+
}
197202
},
198203
rightParen: .rightParenToken(),
199204
trailingClosure: ClosureExprSyntax(

Sources/Feather/Queries/AnyDatabaseQuery.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public struct AnyDatabaseQuery<Input, Output>: DatabaseQuery
3131
public init(
3232
_ transactionKind: Transaction.Kind,
3333
in connection: any Connection,
34-
watchingTables watchedTables: Set<String>,
34+
watchingTables watchedTables: Set<String> = [],
3535
execute: @escaping @Sendable (Input, borrowing Transaction) throws -> Output
3636
) {
3737
self.connection = connection

0 commit comments

Comments
 (0)