wip

Author: mbrandonw

Sources/StructuredQueriesCore/SQLite/JSONFunctions.swift

@@ -110,8 +110,32 @@ extension PrimaryKeyedTableDefinition where QueryValue: Codable & Sendable {
       filter: filter?.queryFragment
     )
   }
+}
+
+
+extension PrimaryKeyedTableDefinition {
+  public func jsonGroupArray<Wrapped: Codable & Sendable>(
+    isDistinct: Bool = false,
+    order: (some QueryExpression)? = Bool?.none,
+    filter: (some QueryExpression<Bool>)? = Bool?.none
+  ) -> some QueryExpression<[Wrapped].JSONRepresentation>
+  where QueryValue == Wrapped?
+  {
+    let filterQueryFragment = if let filter {
+      self.primaryKey.isNot(nil).and(filter).queryFragment
+    } else {
+      self.primaryKey.isNot(nil).queryFragment
+    }
+    return AggregateFunction(
+      "json_group_array",
+      isDistinct: isDistinct,
+      [jsonObject.queryFragment],
+      order: order?.queryFragment,
+      filter: filterQueryFragment
+    )
+  }
 
-  private var jsonObject: some QueryExpression<QueryValue> {
+  fileprivate var jsonObject: some QueryExpression<QueryValue> {
     func open<TableColumn: TableColumnExpression>(_ column: TableColumn) -> QueryFragment {
       typealias Value = TableColumn.QueryValue._Optionalized.Wrapped
 
@@ -143,8 +167,8 @@ extension PrimaryKeyedTableDefinition where QueryValue: Codable & Sendable {
       } 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,
-        isJSONRepresentation(codableType)
+                  as? any (Codable & Sendable).Type,
+                isJSONRepresentation(codableType)
       {
         return "\(quote: column.name, delimiter: .text), json(\(column))"
       } else {

Tests/StructuredQueriesTests/JSONFunctionsTests.swift

@@ -136,21 +136,21 @@ extension SnapshotTests {
             ReminderRow.Columns(
               assignedUser: user,
               reminder: reminder,
-              tags: #sql("\(tag.jsonGroupArray())")
+              tags: tag.jsonGroupArray()
             )
           }
           .limit(2)
       ) {
         """
-        SELECT "users"."id", "users"."name" AS "assignedUser", "reminders"."id", "reminders"."assignedUserID", "reminders"."dueDate", "reminders"."isCompleted", "reminders"."isFlagged", "reminders"."notes", "reminders"."priority", "reminders"."remindersListID", "reminders"."title" AS "reminder", json_group_array(CASE WHEN ("tags"."id" IS NOT NULL) THEN json_object('id', json_quote("tags"."id"), 'title', json_quote("tags"."title")) END) AS "tags"
+        SELECT "users"."id", "users"."name" AS "assignedUser", "reminders"."id", "reminders"."assignedUserID", "reminders"."dueDate", "reminders"."isCompleted", "reminders"."isFlagged", "reminders"."notes", "reminders"."priority", "reminders"."remindersListID", "reminders"."title" AS "reminder", json_group_array(CASE WHEN ("tags"."id" IS NOT NULL) THEN json_object('id', json_quote("tags"."id"), 'title', json_quote("tags"."title")) END) FILTER (WHERE ("tags"."id" IS NOT NULL)) AS "tags"
         FROM "reminders"
         LEFT JOIN "remindersTags" ON ("reminders"."id" = "remindersTags"."reminderID")
         LEFT JOIN "tags" ON ("remindersTags"."tagID" = "tags"."id")
         LEFT JOIN "users" ON ("reminders"."assignedUserID" = "users"."id")
         GROUP BY "reminders"."id"
         LIMIT 2
         """
-      } results: {
+      }results: {
         """
         ┌──────────────────────────────────────────────┐
         │ ReminderRow(                                 │
@@ -214,26 +214,22 @@ extension SnapshotTests {
       assertQuery(
         RemindersList
           .group(by: \.id)
-          .leftJoin(Milestone.all) { $0.id.eq($2.remindersListID) }
-          .leftJoin(Reminder.incomplete) { $0.id.eq($1.remindersListID) }
-          .select { remindersList, milestone, reminder in
+          .leftJoin(Milestone.all) { $0.id.eq($1.remindersListID) }
+          .leftJoin(Reminder.incomplete) { $0.id.eq($2.remindersListID) }
+          .select {
             RemindersListRow.Columns(
-              remindersList: remindersList,
-              milestones: #sql(
-                "\(milestone.jsonGroupArray(isDistinct: true, filter: milestone.id.isNot(nil)))"
-              ),
-              reminders: #sql(
-                "\(reminder.jsonGroupArray(isDistinct: true, filter: reminder.id.isNot(nil)))"
-              )
+              remindersList: $0,
+              milestones: $1.jsonGroupArray(isDistinct: true),
+              reminders: $2.jsonGroupArray(isDistinct: true)
             )
           }
           .limit(1)
       ) {
         """
         SELECT "remindersLists"."id", "remindersLists"."color", "remindersLists"."title" AS "remindersList", json_group_array(DISTINCT CASE WHEN ("milestones"."id" IS NOT NULL) THEN json_object('id', json_quote("milestones"."id"), 'remindersListID', json_quote("milestones"."remindersListID"), 'title', json_quote("milestones"."title")) END) FILTER (WHERE ("milestones"."id" IS NOT NULL)) AS "milestones", json_group_array(DISTINCT CASE WHEN ("reminders"."id" IS NOT NULL) THEN json_object('id', json_quote("reminders"."id"), 'assignedUserID', json_quote("reminders"."assignedUserID"), 'dueDate', json_quote("reminders"."dueDate"), 'isCompleted', json(CASE "reminders"."isCompleted" WHEN 0 THEN 'false' WHEN 1 THEN 'true' END), 'isFlagged', json(CASE "reminders"."isFlagged" WHEN 0 THEN 'false' WHEN 1 THEN 'true' END), 'notes', json_quote("reminders"."notes"), 'priority', json_quote("reminders"."priority"), 'remindersListID', json_quote("reminders"."remindersListID"), 'title', json_quote("reminders"."title")) END) FILTER (WHERE ("reminders"."id" IS NOT NULL)) AS "reminders"
         FROM "remindersLists"
-        LEFT JOIN "reminders" ON ("remindersLists"."id" = "reminders"."remindersListID")
         LEFT JOIN "milestones" ON ("remindersLists"."id" = "milestones"."remindersListID")
+        LEFT JOIN "reminders" ON ("remindersLists"."id" = "reminders"."remindersListID")
         WHERE NOT ("reminders"."isCompleted")
         GROUP BY "remindersLists"."id"
         LIMIT 1