Merge pull request #54 from siemensikkema/master

Fix SQL UPDATE syntax
vapor · Jul 20, 2016 · 4a7a95f · 4a7a95f
2 parents 855480e + 60ca7a4
commit 4a7a95f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Sources/Fluent/SQL/GeneralSQLSerializer.swift b/Sources/Fluent/SQL/GeneralSQLSerializer.swift
@@ -82,8 +82,9 @@ public class GeneralSQLSerializer: SQLSerializer {
 
             statement += "UPDATE"
             statement += sql(table)
+            statement += "SET"
 
-            let (dataClause, dataValues) = sql(data)
+            let (dataClause, dataValues) = sql(update: data)
             statement += dataClause
             values += dataValues
 
@@ -246,6 +247,17 @@ public class GeneralSQLSerializer: SQLSerializer {
         )
     }
 
+    public func sql(update data: [String: Value]) -> (String, [Value]) {
+        return (
+            data.map(sql).joined(separator: ", "),
+            Array(data.values)
+        )
+    }
+
+    public func sql(key: String, value: Value) -> String {
+        return sql(key) + " = " + sql(value)
+    }
+
     public func sql(_ strings: [String]) -> String {
         return strings.joined(separator: " ")
     }

diff --git a/Tests/Fluent/SQLSerializerTests.swift b/Tests/Fluent/SQLSerializerTests.swift
@@ -41,7 +41,7 @@ class SQLSerializerTests: XCTestCase {
         let update = SQL.update(table: "friends", filters: [filter], data: ["not it": true])
         let (statement, values) = serialize(update)
 
-        XCTAssertEqual(statement, "UPDATE `friends` (`not it`) VALUES (?) WHERE `name` = ?")
+        XCTAssertEqual(statement, "UPDATE `friends` SET `not it` = ? WHERE `name` = ?")
         XCTAssertEqual(values.first?.bool, true)
         XCTAssertEqual(values.last?.string, "duck")
         XCTAssertEqual(values.count, 2)