wip

Author: stephencelis

Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift

@@ -97,18 +97,34 @@ extension PrimaryKeyedTableDefinition where QueryValue: Codable & Sendable {
 
   private var jsonObject: some QueryExpression<QueryValue> {
     func open<TableColumn: TableColumnExpression>(_ column: TableColumn) -> QueryFragment {
-      func isJSONRepresentation<T: Codable & Sendable>(_: T.Type) -> Bool {
-        TableColumn.QueryValue.self == JSONRepresentation<T>.self
+      typealias Value = TableColumn.QueryValue._Optionalized.Wrapped
+
+      func isJSONRepresentation<T: Codable & Sendable>(_: T.Type, isOptional: Bool = false) -> Bool
+      {
+        func isOptionalJSONRepresentation<U: _OptionalProtocol>(_: U.Type) -> Bool {
+          if let codableType = U.Wrapped.self as? any (Codable & Sendable).Type {
+            return isJSONRepresentation(codableType, isOptional: true)
+          } else {
+            return false
+          }
+        }
+        if let optionalType = T.self as? any _OptionalProtocol.Type {
+          return isOptionalJSONRepresentation(optionalType)
+        } else if isOptional {
+          return TableColumn.QueryValue.self == JSONRepresentation<T>?.self
+        } else {
+          return Value.self == JSONRepresentation<T>.self
+        }
       }
 
-      if TableColumn.QueryValue.self == Bool.self {
+      if Value.self == Bool.self {
         return """
           \(quote: column.name, delimiter: .text), \
           json(CASE \(column) WHEN 0 THEN 'false' WHEN 1 THEN 'true' END)
           """
-      } else if TableColumn.QueryValue.self == Date.UnixTimeRepresentation.self {
+      } else if Value.self == Date.UnixTimeRepresentation.self {
         return "\(quote: column.name, delimiter: .text), datetime(\(column), 'unixepoch')"
-      } else if TableColumn.QueryValue.self == Date.JulianDayRepresentation.self {
+      } else if Value.self == Date.JulianDayRepresentation.self {
         return "\(quote: column.name, delimiter: .text), datetime(\(column), 'julianday')"
       } else if let codableType = TableColumn.QueryValue.QueryOutput.self
         as? any (Codable & Sendable).Type,

Tests/StructuredQueriesTests/JSONFunctionsTests.swift

@@ -267,36 +267,8 @@ extension SnapshotTests {
         """
       }
     }
-
-    @Test func associationWithJSONField() {
-      assertQuery(
-        TaskList
-          .join(Task.all) { $0.id.eq($1.taskListID) }
-          .select {
-            TaskListRow.Columns(taskList: $0, tasks: $1.jsonGroupArray())
-          }
-      ) {
-        """
-        SELECT "taskLists"."id" AS "taskList", json_group_array(CASE WHEN ("tasks"."id" IS NOT NULL) THEN json_object('id', json_quote("tasks"."id"), 'notes', json("tasks"."notes"), 'taskListID', json_quote("tasks"."taskListID")) END) AS "tasks"
-        FROM "taskLists"
-        JOIN "tasks" ON ("taskLists"."id" = "tasks"."taskListID")
-        """
-      } results: {
-        """
-        no such table: taskLists
-        """
-      }
-    }
   }
 }
-/*
- TODO: split json association tests into own suite with custom schema
- * exercise Bool? path
- * exercise Data/UUID path with JSON
- * exercise dates
- * exercise JSONRepresentation field (such as [String] notes)
- * exercise path that removes the NULL filter to see how that can come up
- */
 
 @Selection
 private struct ReminderRow {
@@ -312,19 +284,3 @@ private struct RemindersListRow {
   @Column(as: JSONRepresentation<[Reminder]>.self)
   let reminders: [Reminder]
 }
-
-@Table struct TaskList {
-  let id: Int
-}
-@Table
-struct Task: Codable {
-  let id: Int
-  @Column(as: JSONRepresentation<[String]>.self)
-  var notes: [String]
-  var taskListID: Int
-}
-@Selection struct TaskListRow {
-  let taskList: TaskList
-  @Column(as: JSONRepresentation<[Task]>.self)
-  let tasks: [Task]
-}