point string decode

Author: tanner0101

Sources/PostgreSQL/Data/PostgreSQLData+Date.swift

@@ -0,0 +1,45 @@
+import Foundation
+
+extension Date: PostgreSQLDataCustomConvertible {
+    /// See `PostgreSQLDataCustomConvertible.preferredDataType`
+    public static var preferredDataType: PostgreSQLDataType? { return .timestamp }
+
+    /// See `PostgreSQLDataCustomConvertible.convertFromPostgreSQLData(_:)`
+    public static func convertFromPostgreSQLData(_ data: PostgreSQLData) throws -> Date {
+        guard let value = data.data else {
+            throw PostgreSQLError(identifier: "data", reason: "Could not decode String from `null` data.")
+        }
+        switch data.format {
+        case .text:
+            switch data.type {
+            case .timestamp: return try value.makeString().parseDate(format:  "yyyy-MM-dd HH:mm:ss")
+            case .date: return try value.makeString().parseDate(format:  "yyyy-MM-dd")
+            case .time: return try value.makeString().parseDate(format:  "HH:mm:ss")
+            default: throw PostgreSQLError(identifier: "date", reason: "Could not parse Date from text data type: \(data.type).")
+            }
+        case .binary: throw PostgreSQLError(identifier: "date", reason: "Could not parse Date from binary data type: \(data.type).")
+        }
+    }
+
+    /// See `PostgreSQLDataCustomConvertible.convertToPostgreSQLData()`
+    public func convertToPostgreSQLData() throws -> PostgreSQLData {
+        return PostgreSQLData(type: .timestamp, format: .text, data: Data(description.utf8))
+    }
+}
+
+extension String {
+    /// Parses a Date from this string with the supplied date format.
+    fileprivate func parseDate(format: String) throws -> Date {
+        let formatter = DateFormatter()
+        if contains(".") {
+            formatter.dateFormat = format + ".SSSSSS"
+        } else {
+            formatter.dateFormat = format
+        }
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        guard let date = formatter.date(from: self) else {
+            throw PostgreSQLError(identifier: "date", reason: "Malformed date: \(self)")
+        }
+        return date
+    }
+}

Sources/PostgreSQL/DataType/PostgreSQLDataType+Parse.swift

@@ -97,21 +97,5 @@ extension PostgreSQLDataType {
 
 /// MARK: String Helpers
 
-extension String {
-    /// Parses a Date from this string with the supplied date format.
-    fileprivate func parseDate(format: String) throws -> Date {
-        let formatter = DateFormatter()
-        if contains(".") {
-            formatter.dateFormat = format + ".SSSSSS"
-        } else {
-            formatter.dateFormat = format
-        }
-        formatter.timeZone = TimeZone(secondsFromGMT: 0)
-        guard let date = formatter.date(from: self) else {
-            throw PostgreSQLError(identifier: "date", reason: "Malformed date: \(self)")
-        }
-        return date
-    }
-}
 
 

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -118,7 +118,10 @@ class PostgreSQLConnectionTests: XCTestCase {
             try XCTAssertEqual(row["text"]?.decode(String.self), "11")
             try XCTAssertEqual(row["bytea"]?.decode(Data.self), Data([0x31, 0x32]))
             try XCTAssertEqual(row["boolean"]?.decode(Bool.self), true)
-            // try XCTAssertEqual(row["point"]?.decode(Int16.self), .point(x: 13.5, y: 14)) // FIXME: decode point?
+            try XCTAssertNotNil(row["timestamp"]?.decode(Date.self))
+            try XCTAssertNotNil(row["date"]?.decode(Date.self))
+            try XCTAssertNotNil(row["time"]?.decode(Date.self))
+            try XCTAssertEqual(row["point"]?.decode(String.self), "(13.5,14)")
         } else {
             XCTFail("query result count is: \(queryResult.count)")
         }