Skip to content

Commit 8071b4f

Browse files
committed
updated for changes in Query for passing parameter tests
1 parent c7e6463 commit 8071b4f

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

CbliteSwiftJsLib/Classes/DatabaseManager.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,14 @@ public class DatabaseManager {
245245

246246
// MARK: SQL++ Query Functions
247247

248-
public func executeQuery(_ query: String,
248+
public func executeQuery(_ queryString: String,
249249
parameters: [String: Any]? = nil,
250250
databaseName: String) throws -> String {
251251
do {
252252
guard let database = self.getDatabase(databaseName) else {
253253
throw DatabaseError.invalidDatabaseName(databaseName: databaseName)
254254
}
255-
let query = try database.createQuery(query)
255+
let query = try database.createQuery(queryString)
256256
if let params = parameters {
257257
let queryParams = try QueryHelper.getParamatersFromJson(params)
258258
query.parameters = queryParams

CbliteSwiftJsLib/Classes/QueryHelper.swift

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,23 @@ public struct QueryHelper {
4747
parameters.setDouble(doubleValue, forName: key)
4848
}
4949
case "date":
50-
if let dateValue = value as? Date {
51-
parameters.setDate(dateValue, forName: key)
50+
if let dateValue = value as? String {
51+
//convert the date
52+
let dateFormatter = ISO8601DateFormatter()
53+
dateFormatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
54+
let date = dateFormatter.date(from: dateValue)
55+
parameters.setDate(date, forName: key)
5256
}
5357
case "int":
5458
if let intValue = value as? Int {
5559
parameters.setInt(intValue, forName: key)
5660
}
57-
case "int64":
61+
case "long":
5862
if let int64Value = value as? Int64 {
5963
parameters.setInt64(int64Value, forName: key)
6064
}
65+
case "value":
66+
parameters.setValue(value, forName: key)
6167
default:
6268
throw QueryError.invalidParameter(message: type)
6369
}

0 commit comments

Comments
 (0)