wip

Author: stephencelis

Sources/StructuredQueriesCore/Internal/Deprecations.swift

@@ -113,7 +113,7 @@ extension PrimaryKeyedTable {
 }
 
 // TODO: Support composite keys.
-extension PrimaryKeyedTable where TableColumns.PrimaryKeyColumn == TableColumn<Self, PrimaryKey> {
+extension PrimaryKeyedTable where TableColumns.PrimaryColumn == TableColumn<Self, PrimaryKey> {
   @available(
     *, deprecated, message: "Use a trailing closure, instead: 'Table.upsert { draft }'"
   )

Sources/StructuredQueriesCore/Optional.swift

@@ -140,6 +140,16 @@ extension Optional: Table, PartialSelectStatement, Statement where Wrapped: Tabl
       )
     }
 
+    public subscript<Member>(
+      dynamicMember keyPath: KeyPath<Wrapped.TableColumns, GeneratedColumn<Wrapped, Member>>
+    ) -> GeneratedColumn<Optional, Member?> {
+      let column = Wrapped.columns[keyPath: keyPath]
+      return GeneratedColumn<Optional, Member?>(
+        column.name,
+        keyPath: \.[member: \Member.self, column: column.keyPath]
+      )
+    }
+
     public subscript<Member: QueryExpression>(
       dynamicMember keyPath: KeyPath<Wrapped.TableColumns, Member>
     ) -> some QueryExpression<Member.QueryValue?> {
@@ -161,7 +171,7 @@ extension Optional: Table, PartialSelectStatement, Statement where Wrapped: Tabl
 extension Optional: PrimaryKeyedTable
 where
   Wrapped: PrimaryKeyedTable,
-  Wrapped.TableColumns.PrimaryKeyColumn == TableColumn<Wrapped, Wrapped.PrimaryKey>
+  Wrapped.TableColumns.PrimaryColumn == TableColumn<Wrapped, Wrapped.PrimaryKey>
 {
   public typealias Draft = Wrapped.Draft?
 }
@@ -170,7 +180,7 @@ where
 extension Optional: TableDraft
 where
   Wrapped: TableDraft,
-  Wrapped.PrimaryTable.TableColumns.PrimaryKeyColumn == TableColumn<
+  Wrapped.PrimaryTable.TableColumns.PrimaryColumn == TableColumn<
     Wrapped.PrimaryTable, Wrapped.PrimaryTable.PrimaryKey
   >
 {
@@ -184,7 +194,7 @@ where
 extension Optional.TableColumns: PrimaryKeyedTableDefinition
 where
   Wrapped.TableColumns: PrimaryKeyedTableDefinition,
-  Wrapped.TableColumns.PrimaryKeyColumn == TableColumn<Wrapped, Wrapped.PrimaryKey>
+  Wrapped.TableColumns.PrimaryColumn == TableColumn<Wrapped, Wrapped.PrimaryKey>
 {
   public typealias PrimaryKey = Wrapped.TableColumns.PrimaryKey?
 

Sources/StructuredQueriesCore/PrimaryKeyed.swift

@@ -52,10 +52,10 @@ where QueryValue: PrimaryKeyedTable {
   associatedtype PrimaryKey: QueryRepresentable & QueryExpression
   where PrimaryKey.QueryValue == PrimaryKey
 
-  associatedtype PrimaryKeyColumn: _TableColumnExpression<QueryValue, PrimaryKey>
+  associatedtype PrimaryColumn: _TableColumnExpression<QueryValue, PrimaryKey>
 
   /// The column representing this table's primary key.
-  var primaryKey: PrimaryKeyColumn { get }
+  var primaryKey: PrimaryColumn { get }
 }
 
 extension TableDefinition where QueryValue: TableDraft {
@@ -66,7 +66,7 @@ extension TableDefinition where QueryValue: TableDraft {
   }
 }
 
-extension PrimaryKeyedTableDefinition where PrimaryKeyColumn: TableColumnExpression {
+extension PrimaryKeyedTableDefinition where PrimaryColumn: TableColumnExpression {
   /// A query expression representing the number of rows in this table.
   ///
   /// - Parameters:

Sources/StructuredQueriesCore/Statements/Insert.swift

@@ -617,7 +617,7 @@ extension Table {
 }
 
 // TODO: Support composite keys.
-extension PrimaryKeyedTable where TableColumns.PrimaryKeyColumn == TableColumn<Self, PrimaryKey> {
+extension PrimaryKeyedTable where TableColumns.PrimaryColumn == TableColumn<Self, PrimaryKey> {
   /// An upsert statement for given drafts.
   ///
   /// Generates an insert statement with an upsert clause. Useful for building forms that can both

Sources/StructuredQueriesCore/TableAlias.swift

@@ -179,7 +179,7 @@ public struct TableAlias<
 extension TableAlias: PrimaryKeyedTable
 where
   Base: PrimaryKeyedTable,
-  Base.TableColumns.PrimaryKeyColumn == TableColumn<Base, Base.PrimaryKey>
+  Base.TableColumns.PrimaryColumn == TableColumn<Base, Base.PrimaryKey>
 {
   public typealias Draft = TableAlias<Base.Draft, Name>
 }
@@ -188,7 +188,7 @@ where
 extension TableAlias: TableDraft
 where
   Base: TableDraft,
-  Base.PrimaryTable.TableColumns.PrimaryKeyColumn == TableColumn<
+  Base.PrimaryTable.TableColumns.PrimaryColumn == TableColumn<
     Base.PrimaryTable, Base.PrimaryTable.PrimaryKey
   >
 {
@@ -202,7 +202,7 @@ where
 extension TableAlias.TableColumns: PrimaryKeyedTableDefinition
 where
   Base.TableColumns: PrimaryKeyedTableDefinition,
-  Base.TableColumns.PrimaryKeyColumn == TableColumn<Base, Base.PrimaryKey>
+  Base.TableColumns.PrimaryColumn == TableColumn<Base, Base.PrimaryKey>
 {
   public typealias PrimaryKey = Base.TableColumns.PrimaryKey
 

Sources/StructuredQueriesSQLiteCore/Insert.swift

@@ -451,7 +451,7 @@ extension Table {
 }
 
 // TODO: Support composite keys.
-extension PrimaryKeyedTable where TableColumns.PrimaryKeyColumn == TableColumn<Self, PrimaryKey> {
+extension PrimaryKeyedTable where TableColumns.PrimaryColumn == TableColumn<Self, PrimaryKey> {
   /// An upsert statement for given drafts.
   ///
   /// - Parameters:

Sources/StructuredQueriesSQLiteCore/Internal/Deprecations.swift

@@ -85,7 +85,7 @@ extension PrimaryKeyedTable {
 }
 
 // TODO: Support composite keys.
-extension PrimaryKeyedTable where TableColumns.PrimaryKeyColumn == TableColumn<Self, PrimaryKey> {
+extension PrimaryKeyedTable where TableColumns.PrimaryColumn == TableColumn<Self, PrimaryKey> {
   @available(
     *, deprecated, message: "Use a trailing closure, instead: 'Table.upsert { draft }'"
   )

Sources/StructuredQueriesSQLiteCore/JSONFunctions.swift

@@ -126,7 +126,7 @@ extension PrimaryKeyedTableDefinition where QueryValue: Codable {
 extension PrimaryKeyedTableDefinition
 where
   QueryValue: _OptionalProtocol & Codable,
-  PrimaryKeyColumn == TableColumn<QueryValue, PrimaryKey>
+  PrimaryColumn == TableColumn<QueryValue, PrimaryKey>
 {
   /// A JSON array representation of the aggregation of a table's columns.
   ///

Tests/StructuredQueriesTests/NestedTests.swift

@@ -51,6 +51,28 @@ extension SnapshotTests {
         └──────────────────────────┘
         """
       }
+      assertQuery(
+        Item.insert {
+          $0.status.isOutOfStock
+        } values: {
+          true
+        }
+      ) {
+        """
+        INSERT INTO "items"
+        ("isOutOfStock")
+        VALUES
+        (1)
+        """
+      }
+      // TODO: Make work?
+      // assertQuery(
+      //   Item.insert {
+      //     $0.status
+      //   } values: {
+      //     Status(isOutOfStock: true, isOnBackOrder: false)
+      //   }
+      // )
       assertQuery(
         Item.all
       ) {
@@ -69,6 +91,15 @@ extension SnapshotTests {
         │     isOnBackOrder: false │
         │   )                      │
         │ )                        │
+        ├──────────────────────────┤
+        │ Item(                    │
+        │   title: "",             │
+        │   quantity: 0,           │
+        │   status: Status(        │
+        │     isOutOfStock: true,  │
+        │     isOnBackOrder: false │
+        │   )                      │
+        │ )                        │
         └──────────────────────────┘
         """
       }
@@ -110,7 +141,7 @@ extension SnapshotTests {
         SET "isOutOfStock" = 1, "isOnBackOrder" = 1
         """
       }
-      // FIXME: This should decode 'nil' but because all its fields have defaults it coalesces.
+      // FIXME: These should decode 'nil' but because all its fields have defaults it coalesces.
       assertQuery(
         DefaultItem?(nil)
       ) {
@@ -360,7 +391,7 @@ private struct Timestamps {
   var createdAt: Date
   var updatedAt: Date
   var deletedAt: Date?
-  @Column(generated: .stored)
+  @Column(generated: .virtual)
   let isDeleted: Bool
 }