wip

Author: stephencelis

Sources/StructuredQueriesCore/ColumnGroup.swift

@@ -3,7 +3,7 @@ public struct ColumnGroup<Root: Table, Values: Table>: _TableColumnExpression
 where Values.QueryOutput == Values {
   public typealias Value = Values
 
-  public var name: String { Values.tableName }
+  public var _names: [String] { Values.TableColumns.allColumns.map(\.name) }
 
   public typealias QueryValue = Values
 

Sources/StructuredQueriesCore/Internal/Deprecations.swift

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

Sources/StructuredQueriesCore/Statements/Insert.swift

@@ -616,8 +616,7 @@ extension Table {
   }
 }
 
-// TODO: Support composite keys.
-extension PrimaryKeyedTable where TableColumns.PrimaryColumn == TableColumn<Self, PrimaryKey> {
+extension PrimaryKeyedTable {
   /// An upsert statement for given drafts.
   ///
   /// Generates an insert statement with an upsert clause. Useful for building forms that can both
@@ -636,15 +635,20 @@ extension PrimaryKeyedTable where TableColumns.PrimaryColumn == TableColumn<Self
   public static func upsert(
     @InsertValuesBuilder<Self> values: () -> [[QueryFragment]]
   ) -> InsertOf<Self> {
-    insert(
-      values: values,
-      onConflict: { $0.primaryKey },
-      doUpdate: { updates, _ in
+    Insert(
+      conflictResolution: nil,
+      columnNames: TableColumns.writableColumns.map(\.name),
+      conflictTargetColumnNames: columns.primaryKey._names,
+      conflictTargetFilter: [],
+      values: .values(values()),
+      updates: Updates { updates in
         for (column, excluded) in zip(Draft.TableColumns.writableColumns, Excluded.writableColumns)
-        where column.name != columns.primaryKey.name {
+        where !columns.primaryKey._names.contains(column.name) {
           updates.set(column, excluded.queryFragment)
         }
-      }
+      },
+      updateFilter: [],
+      returning: []
     )
   }
 }

Sources/StructuredQueriesCore/Statements/Update.swift

@@ -62,7 +62,8 @@ extension PrimaryKeyedTable {
     _ row: Self
   ) -> UpdateOf<Self> {
     update { updates in
-      for column in TableColumns.writableColumns where column.name != columns.primaryKey.name {
+      for column in TableColumns.writableColumns
+      where !columns.primaryKey._names.contains(column.name) {
         func open<Root, Value>(_ column: some WritableTableColumnExpression<Root, Value>) {
           updates.set(
             column,

Sources/StructuredQueriesCore/TableColumn.swift

@@ -2,8 +2,7 @@ public protocol _TableColumnExpression<Root, Value>: QueryExpression where Value
   associatedtype Root: Table
   associatedtype Value: QueryRepresentable
 
-  /// The name of the table column.
-  var name: String { get }
+  var _names: [String] { get }
 
   /// The table model key path associated with this table column.
   var keyPath: KeyPath<Root, Value.QueryOutput> { get }
@@ -26,6 +25,10 @@ where Value: QueryBindable {
   ) -> any TableColumnExpression<TableAlias<Root, Name>, Value>
 }
 
+extension TableColumnExpression {
+  public var _names: [String] { [name] }
+}
+
 /// A type representing a _writable_ table column, _i.e._ not a generated column.
 public protocol WritableTableColumnExpression<Root, Value>: TableColumnExpression {
   func _aliased<Name: AliasName>(

Sources/StructuredQueriesSQLiteCore/Insert.swift

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

Sources/StructuredQueriesSQLiteCore/Internal/Deprecations.swift

@@ -82,10 +82,7 @@ extension PrimaryKeyedTable {
   ) -> InsertOf<Self> {
     insert(or: conflictResolution, values: { rows }, onConflictDoUpdate: updates)
   }
-}
 
-// TODO: Support composite keys.
-extension PrimaryKeyedTable where TableColumns.PrimaryColumn == TableColumn<Self, PrimaryKey> {
   @available(
     *, deprecated, message: "Use a trailing closure, instead: 'Table.upsert { draft }'"
   )

Tests/StructuredQueriesTests/NestedTests.swift

@@ -353,6 +353,22 @@ extension SnapshotTests {
         └───────────────────────────────────────────────────────────┘
         """
       }
+      assertQuery(
+        Metadata.upsert {
+          Metadata(
+            id: MetadataID(recordID: UUID(0), recordType: "reminders")
+          )
+        }
+      ) {
+        """
+        INSERT INTO "metadatas"
+        ("recordID", "recordType")
+        VALUES
+        ('00000000-0000-0000-0000-000000000000', 'reminders')
+        ON CONFLICT ("recordID", "recordType")
+        DO NOTHING
+        """
+      }
     }
   }
 }