Merge pull request #14 from morphine-apps/hotfix/query-optional-bindi…

…ngs-fix Fix NULL conversion for optional fields
vapor-community · Oct 10, 2016 · 7b372ed · 7b372ed
2 parents fef6f10 + 5e1079a
commit 7b372ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Sources/PostgreSQL/Database.swift b/Sources/PostgreSQL/Database.swift
@@ -52,6 +52,10 @@ public class Database {
             defer {
                 for i in 0..<values.count {
                     let p = paramsValues[i]
+                    if p == nil {
+                        continue
+                    }
+
                     let mp = UnsafeMutablePointer(mutating: p)
                     mp?.deinitialize()
                     var i = 0
@@ -85,6 +89,13 @@ public class Database {
             .allocate(capacity: values.count)
 
         for i in 0..<values.count {
+            // PQexecParams converts nil pointer to NULL.
+            // see: https://www.postgresql.org/docs/9.1/static/libpq-exec.html
+            if values[i] == .null {
+                paramsValues[i] = nil
+                continue
+            }
+
             var ch = values[i].string?.bytes ?? []
             ch.append(0)
 

diff --git a/Tests/PostgreSQLTests/PostgreSQLTests.swift b/Tests/PostgreSQLTests/PostgreSQLTests.swift
@@ -70,6 +70,8 @@ class PostgreSQLTests: XCTestCase {
         do {
             try postgreSQL.execute("DROP TABLE IF EXISTS parameterization")
             try postgreSQL.execute("CREATE TABLE parameterization (d FLOAT4, i INT, s VARCHAR(16), u INT)")
+
+            try postgreSQL.execute("INSERT INTO parameterization VALUES ($1, $2, $3, $4)", [.null, .null, "life".makeNode(), .null], on: nil)
 
             try postgreSQL.execute("INSERT INTO parameterization VALUES (3.14, NULL, 'pi', NULL)")
             try postgreSQL.execute("INSERT INTO parameterization VALUES (NULL, NULL, 'life', 42)")