Fix PostgreSQLUpsert.upsert bug

vkill · vkill · commit 8f8857b8a1b6 · 2018-06-22T13:07:01.000+08:00
diff --git a/Sources/PostgreSQL/SQL/PostgreSQLUpsert.swift b/Sources/PostgreSQL/SQL/PostgreSQLUpsert.swift
@@ -6,8 +6,8 @@ public struct PostgreSQLUpsert: SQLSerializable {
     public typealias Expression = PostgreSQLExpression
     
     /// See `SQLUpsert`.
-    public static func upsert(_ column: [PostgreSQLColumnIdentifier], _ values: [(Identifier, Expression)]) -> PostgreSQLUpsert {
-        return self.init(columns: [.column(nil, .identifier("id"))], values: values)
+    public static func upsert(_ columns: [PostgreSQLColumnIdentifier]? = nil, _ values: [(Identifier, Expression)]) -> PostgreSQLUpsert {
+        return self.init(columns: columns ?? [.column(nil, .identifier("id"))], values: values)
     }
     
     /// See `SQLUpsert`.

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ public struct PostgreSQLUpsert: SQLSerializable {`
`6`	`6`	`public typealias Expression = PostgreSQLExpression`
`7`	`7`
`8`	`8`	/// See `SQLUpsert`.
`9`		`- public static func upsert(_ column: [PostgreSQLColumnIdentifier], _ values: [(Identifier, Expression)]) -> PostgreSQLUpsert {`
`10`		`- return self.init(columns: [.column(nil, .identifier("id"))], values: values)`
	`9`	`+ public static func upsert(_ columns: [PostgreSQLColumnIdentifier]? = nil, _ values: [(Identifier, Expression)]) -> PostgreSQLUpsert {`
	`10`	`+ return self.init(columns: columns ?? [.column(nil, .identifier("id"))], values: values)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	/// See `SQLUpsert`.