Drop Sendable requirements in protocols (#128)

mbrandonw · stephencelis · web-flow · commit 0fd1b27a7b06 · 2025-08-11T11:23:34.000-07:00
* Remove a bunch of sendable requirements.

* wip

* wip

* sendable select

* wip

* wip

* wip

* wip

* wip

---------

Co-authored-by: Stephen Celis &lt;stephen@stephencelis.com&gt;
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/StructuredQueriesCore/AggregateFunctions.swift b/Sources/StructuredQueriesCore/AggregateFunctions.swift
@@ -209,7 +209,7 @@ extension QueryExpression where Self == AggregateFunction<Int> {
 }
 
 /// A query expression of an aggregate function.
-public struct AggregateFunction<QueryValue>: QueryExpression {
+public struct AggregateFunction<QueryValue>: QueryExpression, Sendable {
   var name: QueryFragment
   var isDistinct: Bool
   var arguments: [QueryFragment]
diff --git a/Sources/StructuredQueriesCore/Collation.swift b/Sources/StructuredQueriesCore/Collation.swift
@@ -2,7 +2,7 @@
 ///
 /// Values of this type are supplied to ``QueryExpression/collate(_:)`` to describe how a string
 /// should be compared in a query.
-public struct Collation: QueryExpression {
+public struct Collation: QueryExpression, Sendable {
   public typealias QueryValue = Never
 
   /// Initializes a collating sequence name from a query fragment.
diff --git a/Sources/StructuredQueriesCore/Optional.swift b/Sources/StructuredQueriesCore/Optional.swift
@@ -80,8 +80,8 @@ extension Optional: Table where Wrapped: Table {
   }
 
   fileprivate subscript<Member: QueryRepresentable>(
-    member _: KeyPath<Member, Member> & Sendable,
-    column keyPath: KeyPath<Wrapped, Member.QueryOutput> & Sendable
+    member _: KeyPath<Member, Member>,
+    column keyPath: KeyPath<Wrapped, Member.QueryOutput>
   ) -> Member.QueryOutput? {
     self?[keyPath: keyPath]
   }
diff --git a/Sources/StructuredQueriesCore/QueryExpression.swift b/Sources/StructuredQueriesCore/QueryExpression.swift
@@ -1,5 +1,5 @@
 /// A type that represents a full or partial SQL query.
-public protocol QueryExpression<QueryValue>: Sendable {
+public protocol QueryExpression<QueryValue> {
   /// The Swift data type representation of the expression's SQL data type.
   ///
   /// For example, a `TEXT` expression may be represented as a `String` query value.
diff --git a/Sources/StructuredQueriesCore/QueryRepresentable/Codable+JSON.swift b/Sources/StructuredQueriesCore/QueryRepresentable/Codable+JSON.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public struct _CodableJSONRepresentation<QueryOutput: Codable & Sendable>: QueryRepresentable {
+public struct _CodableJSONRepresentation<QueryOutput: Codable>: QueryRepresentable {
   public var queryOutput: QueryOutput
 
   public init(queryOutput: QueryOutput) {
diff --git a/Sources/StructuredQueriesCore/SQLQueryExpression.swift b/Sources/StructuredQueriesCore/SQLQueryExpression.swift
@@ -2,7 +2,7 @@
 ///
 /// It is not common to interact with this type directly. A value of this type is returned from the
 /// `#sql` macro. See <doc:SafeSQLStrings> for more information.
-public struct SQLQueryExpression<QueryValue>: Statement {
+public struct SQLQueryExpression<QueryValue>: Sendable, Statement {
   public typealias From = Never
 
   public let queryFragment: QueryFragment
diff --git a/Sources/StructuredQueriesCore/SQLite/ConflictResolution.swift b/Sources/StructuredQueriesCore/SQLite/ConflictResolution.swift
@@ -1,5 +1,5 @@
 /// A conflict resolution algorithm.
-public struct ConflictResolution: QueryExpression {
+public struct ConflictResolution: QueryExpression, Sendable {
   public typealias QueryValue = Never
 
   /// The `ABORT` conflict resolution algorithm.
diff --git a/Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift b/Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift
@@ -20,13 +20,13 @@ extension QueryExpression {
   /// ```
   ///
   /// - Returns: An integer expression of the `json_array_length` function wrapping this expression.
-  public func jsonArrayLength<Element: Codable & Sendable>() -> some QueryExpression<Int>
+  public func jsonArrayLength<Element: Codable>() -> some QueryExpression<Int>
   where QueryValue == [Element].JSONRepresentation {
     QueryFunction("json_array_length", self)
   }
 }
 
-extension QueryExpression where QueryValue: Codable & QueryBindable & Sendable {
+extension QueryExpression where QueryValue: Codable & QueryBindable {
   /// A JSON array aggregate of this expression
   ///
   /// Concatenates all of the values in a group.
@@ -56,7 +56,7 @@ extension QueryExpression where QueryValue: Codable & QueryBindable & Sendable {
   }
 }
 
-extension PrimaryKeyedTableDefinition where QueryValue: Codable & Sendable {
+extension PrimaryKeyedTableDefinition where QueryValue: Codable {
   /// A JSON array representation of the aggregation of a table's columns.
   ///
   /// Constructs a JSON array of JSON objects with a field for each column of the table. This can be
@@ -122,7 +122,7 @@ extension PrimaryKeyedTableDefinition where QueryValue: Codable & Sendable {
   }
 }
 
-extension PrimaryKeyedTableDefinition where QueryValue: _OptionalProtocol & Codable & Sendable {
+extension PrimaryKeyedTableDefinition where QueryValue: _OptionalProtocol & Codable {
   /// A JSON array representation of the aggregation of a table's columns.
   ///
   /// Constructs a JSON array of JSON objects with a field for each column of the table. This can be
@@ -173,7 +173,7 @@ extension PrimaryKeyedTableDefinition where QueryValue: _OptionalProtocol & Coda
   ///   - order: An `ORDER BY` clause to apply to the aggregation.
   ///   - filter: A `FILTER` clause to apply to the aggregation.
   /// - Returns: A JSON array aggregate of this table.
-  public func jsonGroupArray<Wrapped: Codable & Sendable>(
+  public func jsonGroupArray<Wrapped: Codable>(
     isDistinct: Bool = false,
     order: (some QueryExpression)? = Bool?.none,
     filter: (some QueryExpression<Bool>)? = Bool?.none
@@ -195,18 +195,18 @@ extension PrimaryKeyedTableDefinition where QueryValue: _OptionalProtocol & Coda
   }
 }
 
-extension TableDefinition where QueryValue: Codable & Sendable {
+extension TableDefinition where QueryValue: Codable {
   /// A JSON representation of a table's columns.
   ///
   /// Useful for referencing a table row in a larger JSON selection.
   public func jsonObject() -> some QueryExpression<_CodableJSONRepresentation<QueryValue>> {
     func open<TableColumn: TableColumnExpression>(_ column: TableColumn) -> QueryFragment {
       typealias Value = TableColumn.QueryValue._Optionalized.Wrapped
 
-      func isJSONRepresentation<T: Codable & Sendable>(_: T.Type, isOptional: Bool = false) -> Bool
+      func isJSONRepresentation<T: Codable>(_: T.Type, isOptional: Bool = false) -> Bool
       {
         func isOptionalJSONRepresentation<U: _OptionalProtocol>(_: U.Type) -> Bool {
-          if let codableType = U.Wrapped.self as? any (Codable & Sendable).Type {
+          if let codableType = U.Wrapped.self as? any Codable.Type {
             return isJSONRepresentation(codableType, isOptional: true)
           } else {
             return false
@@ -231,7 +231,7 @@ extension TableDefinition where QueryValue: Codable & Sendable {
       } else if Value.self == Date.JulianDayRepresentation.self {
         return "\(quote: column.name, delimiter: .text), datetime(\(column), 'julianday')"
       } else if let codableType = TableColumn.QueryValue.QueryOutput.self
-        as? any (Codable & Sendable).Type,
+        as? any Codable.Type,
         isJSONRepresentation(codableType)
       {
         return "\(quote: column.name, delimiter: .text), json(\(column))"
@@ -246,7 +246,7 @@ extension TableDefinition where QueryValue: Codable & Sendable {
   }
 }
 
-extension Optional.TableColumns where QueryValue: Codable & Sendable {
+extension Optional.TableColumns where QueryValue: Codable {
   /// A JSON representation of a table's columns.
   ///
   /// Useful for referencing a table row in a larger JSON selection.
diff --git a/Sources/StructuredQueriesCore/Statements/CommonTableExpression.swift b/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]
@@ -44,7 +44,7 @@ extension QueryFragment {
   fileprivate var presence: Self? { isEmpty ? nil : self }
 }
 
-public struct CommonTableExpressionClause: QueryExpression {
+public struct CommonTableExpressionClause: QueryExpression, Sendable {
   public typealias QueryValue = ()
   let tableName: QueryFragment
   let select: QueryFragment
diff --git a/Sources/StructuredQueriesCore/Statements/Select.swift b/Sources/StructuredQueriesCore/Statements/Select.swift
@@ -299,7 +299,7 @@ extension Table {
 public struct _SelectClauses: Sendable {
   var isEmpty = false
   var distinct = false
-  var columns: [any QueryExpression] = []
+  var columns: [QueryFragment] = []
   var joins: [_JoinClause] = []
   var `where`: [QueryFragment] = []
   var group: [QueryFragment] = []
@@ -317,7 +317,7 @@ public struct _SelectClauses: Sendable {
 #if compiler(>=6.1)
   @dynamicMemberLookup
 #endif
-public struct Select<Columns, From: Table, Joins> {
+public struct Select<Columns, From: Table, Joins>: Sendable {
   // NB: A parameter pack compiler crash forces us to heap-allocate this storage.
   @CopyOnWrite var clauses = _SelectClauses()
 
@@ -331,7 +331,7 @@ public struct Select<Columns, From: Table, Joins> {
     set { clauses.distinct = newValue }
     _modify { yield &clauses.distinct }
   }
-  fileprivate var columns: [any QueryExpression] {
+  fileprivate var columns: [QueryFragment] {
     get { clauses.columns }
     set { clauses.columns = newValue }
     _modify { yield &clauses.columns }
@@ -370,7 +370,7 @@ public struct Select<Columns, From: Table, Joins> {
   fileprivate init(
     isEmpty: Bool,
     distinct: Bool,
-    columns: [any QueryExpression],
+    columns: [QueryFragment],
     joins: [_JoinClause],
     where: [QueryFragment],
     group: [QueryFragment],
@@ -1527,7 +1527,7 @@ extension Select {
   {
     var iterator = columns.makeIterator()
     func next<Element>() -> SQLQueryExpression<Element> {
-      SQLQueryExpression(iterator.next()!.queryFragment)
+      SQLQueryExpression(iterator.next()!)
     }
     return Select<(repeat (each C2).QueryValue), From, Joins>(
       isEmpty: isEmpty,
@@ -1611,8 +1611,8 @@ extension Select: SelectStatement {
     var query: QueryFragment = "SELECT"
     let columns =
       columns.isEmpty
-      ? [From.columns.queryFragment] + joins.map { $0.table.columns.queryFragment }
-      : columns.map(\.queryFragment)
+      ? [From.columns.queryFragment] + joins.map { $0.tableColumns }
+      : columns
     if distinct {
       query.append(" DISTINCT")
     }
@@ -1650,7 +1650,7 @@ extension Select: SelectStatement {
 public typealias SelectOf<From: Table, each Join: Table> =
   Select<(), From, (repeat each Join)>
 
-public struct _JoinClause: QueryExpression {
+public struct _JoinClause: QueryExpression, Sendable {
   public typealias QueryValue = Never
 
   struct Operator {
@@ -1661,35 +1661,39 @@ public struct _JoinClause: QueryExpression {
     let queryFragment: QueryFragment
   }
 
-  let `operator`: QueryFragment?
-  let table: any Table.Type
   let constraint: QueryFragment
+  let `operator`: QueryFragment?
+  let tableAlias: String?
+  let tableColumns: QueryFragment
+  let tableName: String
 
   init(
     operator: Operator?,
     table: any Table.Type,
     constraint: some QueryExpression<Bool>
   ) {
-    self.operator = `operator`?.queryFragment
-    self.table = table
     self.constraint = constraint.queryFragment
+    self.operator = `operator`?.queryFragment
+    tableAlias = table.tableAlias
+    tableColumns = table.columns.queryFragment
+    tableName = table.tableName
   }
 
   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 = tableAlias {
       query.append("AS \(quote: tableAlias) ")
     }
     query.append("ON \(constraint)")
     return query
   }
 }
 
-public struct _LimitClause: QueryExpression {
+public struct _LimitClause: QueryExpression, Sendable {
   public typealias QueryValue = Never
 
   let maxLength: QueryFragment
diff --git a/Sources/StructuredQueriesCore/Statements/Where.swift b/Sources/StructuredQueriesCore/Statements/Where.swift
@@ -58,7 +58,7 @@ extension Table {
 #if compiler(>=6.1)
   @dynamicMemberLookup
 #endif
-public struct Where<From: Table> {
+public struct Where<From: Table>: Sendable {
   public static func + (lhs: Self, rhs: Self) -> Self {
     Where(predicates: (lhs.predicates + rhs.predicates).removingDuplicates())
   }
diff --git a/Sources/StructuredQueriesCore/TableAlias.swift b/Sources/StructuredQueriesCore/TableAlias.swift
@@ -89,7 +89,7 @@ public struct TableAlias<
   public static var all: SelectOf<Self> {
     var select = unsafeBitCast(Base.all.asSelect(), to: SelectOf<Self>.self)
     select.clauses.columns = select.clauses.columns.map {
-      SQLQueryExpression($0.queryFragment.replacingOccurrences(of: Base.self, with: Name.self))
+      $0.replacingOccurrences(of: Base.self, with: Name.self)
     }
     select.clauses.where = select.clauses.where
       .map { $0.replacingOccurrences(of: Base.self, with: Name.self) }
@@ -105,14 +105,14 @@ public struct TableAlias<
   let base: Base
 
   subscript<Member: QueryRepresentable>(
-    member _: KeyPath<Member, Member> & Sendable,
-    column keyPath: KeyPath<Base, Member.QueryOutput> & Sendable
+    member _: KeyPath<Member, Member>,
+    column keyPath: KeyPath<Base, Member.QueryOutput>
   ) -> Member.QueryOutput {
     base[keyPath: keyPath]
   }
 
   @dynamicMemberLookup
-  public struct TableColumns: TableDefinition {
+  public struct TableColumns: Sendable, TableDefinition {
     public static var allColumns: [any TableColumnExpression] {
       #if compiler(>=6.1)
         return Base.TableColumns.allColumns.map { $0._aliased(Name.self) }
diff --git a/Sources/StructuredQueriesCore/TableColumn.swift b/Sources/StructuredQueriesCore/TableColumn.swift
diff --git a/Sources/StructuredQueriesMacros/TableMacro.swift b/Sources/StructuredQueriesMacros/TableMacro.swift
diff --git a/Tests/StructuredQueriesMacrosTests/TableMacroTests.swift b/Tests/StructuredQueriesMacrosTests/TableMacroTests.swift
diff --git a/Tests/StructuredQueriesMacrosTests/TableSelectionMacroTests.swift b/Tests/StructuredQueriesMacrosTests/TableSelectionMacroTests.swift

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ extension QueryExpression where Self == AggregateFunction<Int> {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`/// A query expression of an aggregate function.`
`212`		`-public struct AggregateFunction<QueryValue>: QueryExpression {`
	`212`	`+public struct AggregateFunction<QueryValue>: QueryExpression, Sendable {`
`213`	`213`	`var name: QueryFragment`
`214`	`214`	`var isDistinct: Bool`
`215`	`215`	`var arguments: [QueryFragment]`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ extension Optional: Table where Wrapped: Table {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`fileprivate subscript<Member: QueryRepresentable>(`
`83`		`- member _: KeyPath<Member, Member> & Sendable,`
`84`		`- column keyPath: KeyPath<Wrapped, Member.QueryOutput> & Sendable`
	`83`	`+ member _: KeyPath<Member, Member>,`
	`84`	`+ column keyPath: KeyPath<Wrapped, Member.QueryOutput>`
`85`	`85`	`) -> Member.QueryOutput? {`
`86`	`86`	`self?[keyPath: keyPath]`
`87`	`87`	`}`