wip

Author: stephencelis

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]
   }

Sources/StructuredQueriesCore/Statements/Select.swift

@@ -321,7 +321,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()
 

Sources/StructuredQueriesCore/TableAlias.swift

@@ -106,8 +106,8 @@ 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]
   }

Sources/StructuredQueriesCore/TableColumn.swift

@@ -25,24 +25,23 @@ public protocol TableColumnExpression<Root, Value>: QueryExpression where Value
 /// Don't create instances of this value directly. Instead, use the `@Table` and `@Column` macros to
 /// generate values of this type.
 public struct TableColumn<Root: Table, Value: QueryRepresentable & QueryBindable>:
-  TableColumnExpression,
-  Sendable
-where Value.QueryOutput: Sendable {
+  TableColumnExpression
+{
   public typealias QueryValue = Value
 
   public let name: String
 
   public let defaultValue: Value.QueryOutput?
 
-  let _keyPath: KeyPath<Root, Value.QueryOutput> & Sendable
+  let _keyPath: KeyPath<Root, Value.QueryOutput>
 
   public var keyPath: KeyPath<Root, Value.QueryOutput> {
     _keyPath
   }
 
   public init(
     _ name: String,
-    keyPath: KeyPath<Root, Value.QueryOutput> & Sendable,
+    keyPath: KeyPath<Root, Value.QueryOutput>,
     default defaultValue: Value.QueryOutput? = nil
   ) {
     self.name = name
@@ -52,7 +51,7 @@ where Value.QueryOutput: Sendable {
 
   public init(
     _ name: String,
-    keyPath: KeyPath<Root, Value.QueryOutput> & Sendable,
+    keyPath: KeyPath<Root, Value.QueryOutput>,
     default defaultValue: Value? = nil
   ) where Value == Value.QueryOutput {
     self.name = name

Sources/StructuredQueriesMacros/TableMacro.swift

@@ -549,7 +549,7 @@ extension TableMacro: ExtensionMacro {
         \(declaration.attributes.availability)extension \(type)\
         \(conformances.isEmpty ? "" : ": \(conformances, separator: ", ")") {\
         \(typeAliases, separator: "\n")
-        public static let columns = TableColumns()
+        public static var columns: TableColumns { TableColumns() }
         public static let tableName = \(tableName)\(letSchemaName)\(initDecoder)\(initFromOther)
         }
         """