Kitura/Swift-Kuery#59 Allow nil parameters

Kitura · Mar 2, 2017 · bea4182 · bea4182
1 parent 11cdb54
commit bea4182
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
     name: "SwiftKueryPostgreSQL",
     dependencies: [
         .Package(url: "https://github.com/IBM-Swift/CLibpq.git", majorVersion: 0, minor: 1),
-        .Package(url: "https://github.com/IBM-Swift/Swift-Kuery.git", majorVersion: 0, minor: 6),
+        .Package(url: "https://github.com/IBM-Swift/Swift-Kuery.git", majorVersion: 0, minor: 7),
     ],
     exclude: ["Configuration", "Scripts"]
 )
diff --git a/Sources/SwiftKueryPostgreSQL/PostgreSQLConnection.swift b/Sources/SwiftKueryPostgreSQL/PostgreSQLConnection.swift
@@ -126,7 +126,7 @@ public class PostgreSQLConnection: Connection {
     /// - Parameter query: The query to execute.
     /// - Parameter parameters: An array of the parameters.
     /// - Parameter onCompletion: The function to be called when the execution of the query has completed.
-    public func execute(query: Query, parameters: [Any], onCompletion: @escaping ((QueryResult) -> ())) {
+    public func execute(query: Query, parameters: [Any?], onCompletion: @escaping ((QueryResult) -> ())) {
         do {
             let postgresQuery = try query.build(queryBuilder: queryBuilder)
             executeQueryWithParameters(query: postgresQuery, parameters: parameters, onCompletion: onCompletion)
@@ -169,7 +169,7 @@ public class PostgreSQLConnection: Connection {
     /// - Parameter query: A String with the query to execute.
     /// - Parameter parameters: An array of the parameters.
     /// - Parameter onCompletion: The function to be called when the execution of the query has completed.
-    public func execute(_ raw: String, parameters: [Any], onCompletion: @escaping ((QueryResult) -> ())) {
+    public func execute(_ raw: String, parameters: [Any?], onCompletion: @escaping ((QueryResult) -> ())) {
         executeQueryWithParameters(query: raw, parameters: parameters, onCompletion: onCompletion)
     }
 
@@ -179,14 +179,17 @@ public class PostgreSQLConnection: Connection {
         processQueryResult(query: query, onCompletion: onCompletion)
     }
 
-    private func executeQueryWithParameters(query: String, parameters: [Any], onCompletion: @escaping ((QueryResult) -> ())) {
+    private func executeQueryWithParameters(query: String, parameters: [Any?], onCompletion: @escaping ((QueryResult) -> ())) {
         var parameterData = [UnsafePointer<Int8>?]()
         // At the moment we only create string parameters. Binary parameters should be added.
         for parameter in parameters {
-            let value = AnyCollection("\(parameter)".utf8CString)
-            let pointer = UnsafeMutablePointer<Int8>.allocate(capacity: Int(value.count))
-            for (index, byte) in value.enumerated() {
-                pointer[index] = byte
+            var pointer: UnsafeMutablePointer<Int8>?
+            if parameter != nil {
+                let value = AnyCollection("\(parameter!)".utf8CString)
+                pointer = UnsafeMutablePointer<Int8>.allocate(capacity: Int(value.count))
+                for (index, byte) in value.enumerated() {
+                    pointer![index] = byte
+                }
             }
             parameterData.append(pointer)
         }
@@ -226,7 +229,7 @@ public class PostgreSQLConnection: Connection {
     /// - Parameter query: The query to execute.
     /// - Parameter parameters: A dictionary of the parameters with parameter names as the keys.
     /// - Parameter onCompletion: The function to be called when the execution of the query has completed.
-    public func execute(query: Query, parameters: [String:Any], onCompletion: @escaping ((QueryResult) -> ())) {
+    public func execute(query: Query, parameters: [String:Any?], onCompletion: @escaping ((QueryResult) -> ())) {
         onCompletion(.error(QueryError.unsupported("Named parameters are not supported in PostgreSQL")))
     }
 
@@ -235,7 +238,7 @@ public class PostgreSQLConnection: Connection {
     /// - Parameter query: A String with the query to execute.
     /// - Parameter parameters: A dictionary of the parameters with parameter names as the keys.
     /// - Parameter onCompletion: The function to be called when the execution of the query has completed.
-    public func execute(_ raw: String, parameters: [String:Any], onCompletion: @escaping ((QueryResult) -> ())) {
+    public func execute(_ raw: String, parameters: [String:Any?], onCompletion: @escaping ((QueryResult) -> ())) {
         onCompletion(.error(QueryError.unsupported("Named parameters are not supported in PostgreSQL")))
     }
 

diff --git a/Tests/SwiftKueryPostgreSQLTests/CommonUtils.swift b/Tests/SwiftKueryPostgreSQLTests/CommonUtils.swift
@@ -62,7 +62,7 @@ func executeQuery(query: Query, connection: Connection, callback: @escaping (Que
     }
 }
 
-func executeQueryWithParameters(query: Query, connection: Connection, parameters: Any..., callback: @escaping (QueryResult, [[Any?]]?)->()) {
+func executeQueryWithParameters(query: Query, connection: Connection, parameters: Any?..., callback: @escaping (QueryResult, [[Any?]]?)->()) {
     do {
         try print("=======\(connection.descriptionOf(query: query))=======")
     }
@@ -73,7 +73,7 @@ func executeQueryWithParameters(query: Query, connection: Connection, parameters
     }
 }
 
-func executeRawQueryWithParameters(_ raw: String, connection: Connection, parameters: Any..., callback: @escaping (QueryResult, [[Any?]]?)->()) {
+func executeRawQueryWithParameters(_ raw: String, connection: Connection, parameters: Any?..., callback: @escaping (QueryResult, [[Any?]]?)->()) {
     print("=======\(raw)=======")
     connection.execute(raw, parameters: parameters) { result in
         let rows = printResultAndGetRowsAsArray(result)

diff --git a/Tests/SwiftKueryPostgreSQLTests/TestParameters.swift b/Tests/SwiftKueryPostgreSQLTests/TestParameters.swift
@@ -97,6 +97,11 @@ class TestParameters: XCTestCase {
                                                 XCTAssertEqual(rows!.count, 3, "SELECT returned wrong number of rows: \(rows!.count) instead of 3")
                                                 XCTAssertEqual(rows![2][0]! as! String, "banana", "Wrong value in row 0 column 0: \(rows![2][0]) instead of 'peach'")
                                                 XCTAssertEqual(rows![2][1]! as! String, "4", "Wrong value in row 0 column 0: \(rows![2][1]) instead of 4")
+
+                                                let s2 = Select(from: t).where(t.a != Parameter())
+                                                executeQueryWithParameters(query: s2, connection: connection, parameters: nil) { result, rows in
+                                                    XCTAssertEqual(result.success, true, "SELECT failed")
+                                                }
                                             }
                                         }
                                     }