custom upsert support

Author: tanner0101

Sources/PostgreSQL/SQL/PostgreSQLInsert.swift

@@ -1,7 +1,7 @@
 public struct PostgreSQLInsert: SQLInsert {
     /// See `SQLInsert`.
     public static func insert(_ table: PostgreSQLTableIdentifier) -> PostgreSQLInsert {
-        return .init(insert: .insert(table), returning: [])
+        return self.init(table: table, columns: [], values: [], upsert: nil, returning: [])
     }
 
     /// See `SQLInsert`.
@@ -16,37 +16,36 @@ public struct PostgreSQLInsert: SQLInsert {
     /// See `SQLInsert`.
     public typealias Upsert = PostgreSQLUpsert
 
-    /// Root insert statement.
-    private var insert: GenericSQLInsert<TableIdentifier, ColumnIdentifier, Expression, Upsert>
-
-    /// `RETURNING *`
-    public var returning: [PostgreSQLSelectExpression]
-    
+    /// Table to insert into.
+    public var table: TableIdentifier
     /// See `SQLInsert`.
-    public var columns: [PostgreSQLColumnIdentifier] {
-        get { return insert.columns }
-        set { insert.columns = newValue }
-    }
+    public var columns: [PostgreSQLColumnIdentifier]
 
     /// See `SQLInsert`.
-    public var values: [[PostgreSQLExpression]] {
-        get { return insert.values }
-        set { insert.values = newValue}
-    }
+    public var values: [[PostgreSQLExpression]]
 
-    /// See `SQLInsert`.
-    public var upsert: PostgreSQLUpsert? {
-        get { return insert.upsert }
-        set { insert.upsert = newValue }
-    }
+    /// Optional "upsert" condition.
+    public var upsert: PostgreSQLUpsert?
+    
+    /// `RETURNING *`
+    public var returning: [PostgreSQLSelectExpression]
 
     /// See `SQLSerializable`.
     public func serialize(_ binds: inout [Encodable]) -> String {
-        if returning.isEmpty {
-            return insert.serialize(&binds)
-        } else {
-            return insert.serialize(&binds) + " RETURNING " + returning.serialize(&binds)
+        var sql: [String] = []
+        sql.append("INSERT INTO")
+        sql.append(table.serialize(&binds))
+        sql.append("(" + columns.serialize(&binds) + ")")
+        sql.append("VALUES")
+        sql.append(values.map { "(" + $0.serialize(&binds) + ")"}.joined(separator: ", "))
+        if let upsert = upsert {
+            sql.append(upsert.serialize(&binds))
+        }
+        if !returning.isEmpty {
+            sql.append("RETURNING")
+            sql.append(returning.serialize(&binds))
         }
+        return sql.joined(separator: " ")
     }
 }
 

Sources/PostgreSQL/SQL/PostgreSQLUpsert.swift

@@ -1,12 +1,12 @@
-public struct PostgreSQLUpsert: SQLUpsert {
+public struct PostgreSQLUpsert {
     /// See `SQLUpsert`.
     public typealias Identifier = PostgreSQLIdentifier
 
     /// See `SQLUpsert`.
     public typealias Expression = PostgreSQLExpression
 
     /// See `SQLUpsert`.
-    public static func upsert(_ values: [(Identifier, Expression)]) -> PostgreSQLUpsert {
+    public static func upsert(_ column: [PostgreSQLColumnIdentifier], _ values: [(Identifier, Expression)]) -> PostgreSQLUpsert {
         return self.init(columns: [.column(nil, .identifier("id"))], values: values)
     }
 
@@ -26,3 +26,16 @@ public struct PostgreSQLUpsert: SQLUpsert {
         return sql.joined(separator: " ")
     }
 }
+
+extension SQLInsertBuilder where Connection.Query.Insert == PostgreSQLInsert {
+    public func onConflict<T, V, E>(_ key: KeyPath<T, V>, set value: E) -> Self where
+        T: PostgreSQLTable, E: Encodable
+    {
+        let row = SQLQueryEncoder(PostgreSQLExpression.self).encode(value)
+        let values = row.map { row -> (PostgreSQLIdentifier, PostgreSQLExpression) in
+            return (.identifier(row.key), row.value)
+        }
+        insert.upsert = .upsert([.keyPath(key)], values)
+        return self
+    }
+}