wip

Author: stephencelis

Sources/StructuredQueriesCore/TableColumn.swift

@@ -2,7 +2,8 @@
 ///
 /// This protocol has a single conformance, ``TableColumn``, and simply provides type erasure over
 /// a table's columns. You should not conform to this protocol directly.
-public protocol TableColumnExpression<Root, Value>: QueryExpression where Value == QueryValue {
+public protocol TableColumnExpression<Root, Value>: QueryExpression
+where Value == QueryValue, Value.QueryOutput: Sendable {
   associatedtype Root: Table
   associatedtype Value: QueryRepresentable & QueryBindable
 

Sources/StructuredQueriesCore/Updates.swift

@@ -73,6 +73,24 @@ extension Updates {
 public struct SubtableColumns<Root: Table, Value: Table>: QueryExpression {
   public typealias QueryValue = Value
 
+  public static func allColumns(keyPath: KeyPath<Root, Value> & Sendable) -> [any TableColumnExpression] {
+    return Value.TableColumns.allColumns.map { column in
+      func open<R, V>(
+        _ column: some TableColumnExpression<R, V>
+      ) -> any TableColumnExpression {
+        let keyPath = keyPath.appending(
+          path: unsafeDowncast(column.keyPath, to: KeyPath<Value, V.QueryOutput>.self)
+        )
+        return TableColumn<Root, V>(
+          column.name,
+          keyPath: keyPath.unsafeSendable(),
+          default: column.defaultValue
+        )
+      }
+      return open(column)
+    }
+  }
+
   let keyPath: KeyPath<Root, Value> & Sendable
 
   public init(keyPath: KeyPath<Root, Value> & Sendable) {

Tests/StructuredQueriesTests/NestedTableTests.swift

@@ -41,7 +41,14 @@ extension SnapshotTests {
             someColumns: SomeColumns(isCompleted: true, isPastDue: false)
           )
         }
-      )
+      ) {
+        """
+        INSERT INTO "items"
+        ("title", "quantity", "isCompleted", "isPastDue")
+        VALUES
+        ('Hello', 24, 1, 0)
+        """
+      }
       assertQuery(
         Item.insert {
           ($0.title, $0.quantity, $0.someColumns.isCompleted, $0.someColumns.isPastDue)
@@ -104,6 +111,11 @@ extension SnapshotTests {
         │ )                     │
         ├───────────────────────┤
         │ SomeColumns(          │
+        │   isCompleted: true,  │
+        │   isPastDue: false    │
+        │ )                     │
+        ├───────────────────────┤
+        │ SomeColumns(          │
         │   isCompleted: false, │
         │   isPastDue: false    │
         │ )                     │
@@ -136,6 +148,15 @@ extension SnapshotTests {
         │ )                           │
         ├─────────────────────────────┤
         │ Item(                       │
+        │   title: "Hello",           │
+        │   quantity: 24,             │
+        │   someColumns: SomeColumns( │
+        │     isCompleted: false,     │
+        │     isPastDue: true         │
+        │   )                         │
+        │ )                           │
+        ├─────────────────────────────┤
+        │ Item(                       │
         │   title: "Blob",            │
         │   quantity: 42,             │
         │   someColumns: SomeColumns( │
@@ -168,6 +189,11 @@ extension SnapshotTests {
         │ )                     │
         ├───────────────────────┤
         │ SomeColumns(          │
+        │   isCompleted: true,  │
+        │   isPastDue: false    │
+        │ )                     │
+        ├───────────────────────┤
+        │ SomeColumns(          │
         │   isCompleted: false, │
         │   isPastDue: false    │
         │ )                     │
@@ -196,6 +222,15 @@ extension SnapshotTests {
         │     isPastDue: false        │
         │   )                         │
         │ )                           │
+        ├─────────────────────────────┤
+        │ Item(                       │
+        │   title: "Hello",           │
+        │   quantity: 24,             │
+        │   someColumns: SomeColumns( │
+        │     isCompleted: true,      │
+        │     isPastDue: false        │
+        │   )                         │
+        │ )                           │
         └─────────────────────────────┘
         """
       }
@@ -255,7 +290,7 @@ private struct Item {
     public static var allColumns: [any StructuredQueriesCore.TableColumnExpression] {
       [QueryValue.columns.title]
         + [QueryValue.columns.quantity]
-        + SomeColumns.TableColumns.allColumns
+        + SubtableColumns<QueryValue, SomeColumns>.allColumns(keyPath: \.someColumns)
     }
     public var queryFragment: QueryFragment {
       "\(self.title), \(self.quantity), \(self.someColumns)"