wip

Author: stephencelis

Sources/StructuredQueriesCore/Statements/CommonTableExpression.swift

@@ -1,6 +1,6 @@
 /// Creates a common table expression that can be used to factor subqueries, or create hierarchical
 /// or recursive queries of trees and graphs.
-public struct With<QueryValue>: Statement {
+public struct With<QueryValue>: Statement, Sendable {
   public typealias From = Never
 
   var ctes: [CommonTableExpressionClause]

Sources/StructuredQueriesCore/Statements/CompoundSelect.swift

@@ -11,7 +11,7 @@ extension PartialSelectStatement {
   public func union(
     all: Bool = false,
     _ other: some PartialSelectStatement<QueryValue>
-  ) -> some PartialSelectStatement<QueryValue> {
+  ) -> some PartialSelectStatement<QueryValue> & Sendable {
     CompoundSelect(lhs: self, operator: all ? .unionAll : .union, rhs: other)
   }
 
@@ -25,7 +25,7 @@ extension PartialSelectStatement {
   /// - Returns: A compound select statement.
   public func intersect<F, J>(
     _ other: some SelectStatement<QueryValue, F, J>
-  ) -> some PartialSelectStatement<QueryValue> {
+  ) -> some PartialSelectStatement<QueryValue> & Sendable {
     CompoundSelect(lhs: self, operator: .intersect, rhs: other)
   }
 
@@ -38,12 +38,12 @@ extension PartialSelectStatement {
   /// - Returns: A compound select statement.
   public func except<F, J>(
     _ other: some SelectStatement<QueryValue, F, J>
-  ) -> some PartialSelectStatement<QueryValue> {
+  ) -> some PartialSelectStatement<QueryValue> & Sendable {
     CompoundSelect(lhs: self, operator: .except, rhs: other)
   }
 }
 
-private struct CompoundSelect<QueryValue>: PartialSelectStatement {
+private struct CompoundSelect<QueryValue>: PartialSelectStatement, Sendable {
   typealias From = Never
   typealias Joins = Never
 

Sources/StructuredQueriesCore/Statements/Delete.swift

@@ -35,7 +35,7 @@ extension PrimaryKeyedTable {
 /// This type of statement is constructed from ``Table/delete()`` and ``Where/delete()``.
 ///
 /// To learn more, see <doc:DeleteStatements>.
-public struct Delete<From: Table, Returning> {
+public struct Delete<From: Table, Returning>: Sendable {
   var `where`: [QueryFragment] = []
   var returning: [QueryFragment] = []
 

Sources/StructuredQueriesCore/Statements/Insert.swift

@@ -598,7 +598,7 @@ extension PrimaryKeyedTable {
   }
 }
 
-private enum InsertValues {
+private enum InsertValues: Sendable {
   case `default`
   case values([[QueryFragment]])
   case select(QueryFragment)
@@ -611,7 +611,7 @@ private enum InsertValues {
 /// functions.
 ///
 /// To learn more, see <doc:InsertStatements>.
-public struct Insert<Into: Table, Returning> {
+public struct Insert<Into: Table, Returning>: Sendable {
   var conflictResolution: ConflictResolution?
   var columnNames: [String]
   var conflictTargetColumnNames: [String]

Sources/StructuredQueriesCore/Statements/Select.swift

@@ -1421,7 +1421,7 @@ extension Select: SelectStatement {
     var query: QueryFragment = "SELECT"
     let columns =
       columns.isEmpty
-      ? [From.columns.queryFragment] + joins.map { $0.table.columns.queryFragment }
+      ? [From.columns.queryFragment] + joins.map(\.columns)
       : columns.map(\.queryFragment)
     if distinct {
       query.append(" DISTINCT")
@@ -1472,26 +1472,30 @@ public struct _JoinClause: QueryExpression, Sendable {
   }
 
   let `operator`: QueryFragment?
-  let table: any Table.Type
+  let tableName: String
+  let tableAlias: String?
   let constraint: QueryFragment
+  let columns: QueryFragment
 
-  init(
+  init<T: Table>(
     operator: Operator?,
-    table: any Table.Type,
+    table: T.Type,
     constraint: some QueryExpression<Bool>
   ) {
     self.operator = `operator`?.queryFragment
-    self.table = table
+    self.tableName = table.tableName
+    self.tableAlias = table.tableAlias
     self.constraint = constraint.queryFragment
+    self.columns = table.columns.queryFragment
   }
 
   public var queryFragment: QueryFragment {
     var query: QueryFragment = ""
     if let `operator` {
       query.append("\(`operator`) ")
     }
-    query.append("JOIN \(quote: table.tableName) ")
-    if let tableAlias = table.tableAlias {
+    query.append("JOIN \(quote: tableName) ")
+    if let tableAlias {
       query.append("AS \(quote: tableAlias) ")
     }
     query.append("ON \(constraint)")

Sources/StructuredQueriesCore/Statements/Update.swift

@@ -90,7 +90,7 @@ extension PrimaryKeyedTable {
 /// ``Where/update(or:set:)``.
 ///
 /// To learn more, see <doc:UpdateStatements>.
-public struct Update<From: Table, Returning> {
+public struct Update<From: Table, Returning>: Sendable {
   var conflictResolution: ConflictResolution?
   var updates: Updates<From>
   var `where`: [QueryFragment] = []

Sources/StructuredQueriesCore/Statements/Values.swift

@@ -10,7 +10,7 @@
 ///
 /// While not particularly useful on its own it can act as a helpful starting point for recursive
 /// common table expressions and other subqueries. See <doc:CommonTableExpressions> for more.
-public struct Values<QueryValue>: PartialSelectStatement {
+public struct Values<QueryValue>: PartialSelectStatement, Sendable {
   public typealias From = Never
 
   let values: [QueryFragment]