Use default date/UUID representations

Examples/CaseStudies/SwiftDataTemplateDemo.swift

@@ -58,7 +58,6 @@ struct SwiftDataTemplateView: SwiftUICaseStudy {
 @Table
 private struct Item: Identifiable {
   let id: Int
-  @Column(as: Date.ISO8601Representation.self)
   var timestamp: Date
 }
 

Examples/Reminders/Schema.swift

@@ -16,7 +16,6 @@ struct RemindersList: Hashable, Identifiable {
 @Table
 struct Reminder: Equatable, Identifiable {
   var id: Int
-  @Column(as: Date.ISO8601Representation?.self)
   var dueDate: Date?
   var isCompleted = false
   var isFlagged = false

Examples/SyncUps/Schema.swift

@@ -20,7 +20,6 @@ struct Attendee: Hashable, Identifiable {
 @Table
 struct Meeting: Hashable, Identifiable {
   let id: Int
-  @Column(as: Date.ISO8601Representation.self)
   var date: Date
   var syncUpID: SyncUp.ID
   var transcript: String

Package.swift

@@ -33,7 +33,7 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
     .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
-    .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.2.0"),
+    .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.4.0"),
   ],
   targets: [
     .target(

README.md

@@ -324,7 +324,7 @@ simple as adding it to your `Package.swift`:
 
 ``` swift
 dependencies: [
-  .package(url: "https://github.com/pointfreeco/sharing-grdb", from: "0.2.0")
+  .package(url: "https://github.com/pointfreeco/sharing-grdb", from: "0.4.0")
 ]
 ```
 

Sources/SharingGRDBCore/Documentation.docc/Articles/Fetching.md

@@ -28,18 +28,11 @@ your table:
 struct Reminder {
   let id: Int 
   var title = ""
-  @Column(as: Date.ISO8601Representation?.self)
   var dueAt: Date?
   var isCompleted = false
 }
 ```
 
-> Note: The `@Column` macro determines how to store the date in SQLite, which does not have a native
-> date data type. The `Date.ISO8601Representation` strategy stores dates as text formatted with the
-> ISO-8601 standard. See [Defining your schema] for more info.
-
-[Defining your schema]: https://swiftpackageindex.com/pointfreeco/swift-structured-queries/main/documentation/structuredqueriescore/definingyourschema
-
 With that done you can already fetch all records from the `Reminder` table in their default order by
 simply doing:
 
@@ -106,7 +99,6 @@ exactly one list:
 struct Reminder {
   let id: Int 
   var title = ""
-  @Column(as: Date.ISO8601Representation?.self)
   var dueAt: Date?
   var isCompleted = false
   var remindersListID: RemindersList.ID

Sources/StructuredQueriesGRDBCore/Internal/ISO8601.swift

@@ -0,0 +1,71 @@
+import Foundation
+
+extension Date {
+  @usableFromInline
+  var iso8601String: String {
+    if #available(iOS 15, macOS 12, tvOS 15, watchOS 8, *) {
+      return formatted(.iso8601.currentTimestamp(includingFractionalSeconds: true))
+    } else {
+      return DateFormatter.iso8601(includingFractionalSeconds: true).string(from: self)
+    }
+  }
+
+  @usableFromInline
+  init(iso8601String: String) throws {
+    if #available(iOS 15, macOS 12, tvOS 15, watchOS 8, *) {
+      do {
+        try self.init(
+          iso8601String.queryOutput,
+          strategy: .iso8601.currentTimestamp(includingFractionalSeconds: true)
+        )
+      } catch {
+        try self.init(
+          iso8601String.queryOutput,
+          strategy: .iso8601.currentTimestamp(includingFractionalSeconds: false)
+        )
+      }
+    } else {
+      guard
+        let date = DateFormatter.iso8601(includingFractionalSeconds: true).date(from: iso8601String)
+          ?? DateFormatter.iso8601(includingFractionalSeconds: false).date(from: iso8601String)
+      else {
+        struct InvalidDate: Error { let string: String }
+        throw InvalidDate(string: iso8601String)
+      }
+      self = date
+    }
+  }
+}
+
+extension DateFormatter {
+  fileprivate static func iso8601(includingFractionalSeconds: Bool) -> DateFormatter {
+    includingFractionalSeconds ? iso8601Fractional : iso8601Whole
+  }
+
+  fileprivate static let iso8601Fractional: DateFormatter = {
+    let formatter = DateFormatter()
+    formatter.calendar = Calendar(identifier: .iso8601)
+    formatter.dateFormat = "yyyy-MM-dd HH:mm:ss.SSS"
+    formatter.locale = Locale(identifier: "en_US_POSIX")
+    formatter.timeZone = TimeZone(secondsFromGMT: 0)
+    return formatter
+  }()
+
+  fileprivate static let iso8601Whole: DateFormatter = {
+    let formatter = DateFormatter()
+    formatter.calendar = Calendar(identifier: .iso8601)
+    formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+    formatter.locale = Locale(identifier: "en_US_POSIX")
+    formatter.timeZone = TimeZone(secondsFromGMT: 0)
+    return formatter
+  }()
+}
+
+@available(iOS 15, macOS 12, tvOS 15, watchOS 8, *)
+extension Date.ISO8601FormatStyle {
+  fileprivate func currentTimestamp(includingFractionalSeconds: Bool) -> Self {
+    year().month().day()
+      .dateTimeSeparator(.space)
+      .time(includingFractionalSeconds: includingFractionalSeconds)
+  }
+}

Sources/StructuredQueriesGRDBCore/QueryCursor.swift

@@ -109,6 +109,8 @@ extension QueryBinding {
       switch self {
       case let .blob(blob):
         return Data(blob).databaseValue
+      case let .date(date):
+        return date.iso8601String.databaseValue
       case let .double(double):
         return double.databaseValue
       case let .int(int):
@@ -117,6 +119,8 @@ extension QueryBinding {
         return .null
       case let .text(text):
         return text.databaseValue
+      case let .uuid(uuid):
+        return uuid.uuidString.lowercased().databaseValue
       case let .invalid(error):
         throw error
       }

Sources/StructuredQueriesGRDBCore/SQLiteQueryDecoder.swift

@@ -1,3 +1,4 @@
+import Foundation
 import GRDBSQLite
 import StructuredQueriesCore
 
@@ -31,13 +32,28 @@ struct SQLiteQueryDecoder: QueryDecoder {
     )
   }
 
+  @inlinable
+  mutating func decode(_ columnType: Bool.Type) throws -> Bool? {
+    try decode(Int64.self).map { $0 != 0 }
+  }
+
+  @inlinable
+  mutating func decode(_ columnType: Date.Type) throws -> Date? {
+    try decode(String.self).map { try Date(iso8601String: $0) }
+  }
+
   @inlinable
   mutating func decode(_ columnType: Double.Type) throws -> Double? {
     defer { currentIndex += 1 }
     guard sqlite3_column_type(statement, currentIndex) != SQLITE_NULL else { return nil }
     return sqlite3_column_double(statement, currentIndex)
   }
 
+  @inlinable
+  mutating func decode(_ columnType: Int.Type) throws -> Int? {
+    try decode(Int64.self).map(Int.init)
+  }
+
   @inlinable
   mutating func decode(_ columnType: Int64.Type) throws -> Int64? {
     defer { currentIndex += 1 }
@@ -53,12 +69,15 @@ struct SQLiteQueryDecoder: QueryDecoder {
   }
 
   @inlinable
-  mutating func decode(_ columnType: Bool.Type) throws -> Bool? {
-    try decode(Int64.self).map { $0 != 0 }
+  mutating func decode(_ columnType: UUID.Type) throws -> UUID? {
+    guard let uuidString = try decode(String.self) else { return nil }
+    guard let uuid = UUID(uuidString: uuidString) else { throw InvalidUUID() }
+    return uuid
   }
+}
 
-  @inlinable
-  mutating func decode(_ columnType: Int.Type) throws -> Int? {
-    try decode(Int64.self).map(Int.init)
-  }
+@usableFromInline
+struct InvalidUUID: Error {
+  @usableFromInline
+  init() {}
 }

Tests/StructuredQueriesGRDBTests/MigrationTests.swift

@@ -36,6 +36,5 @@ import Testing
 
 @available(iOS 15, *)
 @Table private struct Model {
-  @Column(as: Date.ISO8601Representation.self)
   var date: Date
 }