Merge pull request vapor#81 from vkill/patch-1

Fix PostgreSQLUpsert.upsert bug

Author: tanner0101

Sources/PostgreSQL/SQL/PostgreSQLUpsert.swift

@@ -6,8 +6,12 @@ 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]?, _ values: [(Identifier, Expression)]) -> PostgreSQLUpsert {
+        if let columns = columns, !columns.isEmpty {
+            return self.init(columns: columns, values: values)
+        } else {
+            return self.init(columns: [.column(nil, .identifier("id"))], values: values)
+        }
     }
 
     /// See `SQLUpsert`.

Tests/PostgreSQLTests/SqlTests/PostgreSQLUpsertTests.swift

@@ -0,0 +1,24 @@
+import PostgreSQL
+import XCTest
+
+class PostgreSQLUpsertTests: XCTestCase {
+
+    func testUpsert() throws {
+        let values: [(PostgreSQLUpsert.Identifier, PostgreSQLUpsert.Expression)] = []
+
+        var upsert: PostgreSQLUpsert
+
+        upsert = PostgreSQLUpsert.upsert(nil, values)
+        XCTAssertEqual(upsert.columns, [PostgreSQLColumnIdentifier.column(nil, .identifier("id"))])
+
+        upsert = PostgreSQLUpsert.upsert([], values)
+        XCTAssertEqual(upsert.columns, [PostgreSQLColumnIdentifier.column(nil, .identifier("id"))])
+
+        upsert = PostgreSQLUpsert.upsert([.column(nil, .identifier("field"))], values)
+        XCTAssertEqual(upsert.columns, [PostgreSQLColumnIdentifier.column(nil, .identifier("field"))])
+    }
+
+    static var allTests = [
+        ("testUpsert", testUpsert),
+    ]
+}