Leverage upstream database seeding helper (#43)

* Leverage upstream database seeding helper

This logic is being incorporated directly into StructuredQueries.

* wip

* wip

Author: stephencelis

Examples/Reminders/RemindersListDetail.swift

@@ -203,7 +203,7 @@ struct RemindersListDetailView: View {
     let remindersList: RemindersList
     let isPastDue: Bool
     let notes: String
-    @Column(as: JSONRepresentation<[String]>.self)
+    @Column(as: [String].JSONRepresentation.self)
     let tags: [String]
   }
 }

Examples/Reminders/Schema.swift

@@ -72,7 +72,7 @@ extension Tag {
 }
 
 extension Tag.TableColumns {
-  var jsonNames: some QueryExpression<JSONRepresentation<[String]>> {
+  var jsonNames: some QueryExpression<[String].JSONRepresentation> {
     self.title.jsonGroupArray(filter: self.title.isNot(nil))
   }
 }

Examples/Reminders/SearchReminders.swift

@@ -112,7 +112,7 @@ struct SearchRemindersView: View {
     let notes: String
     let reminder: Reminders.Reminder
     let remindersList: RemindersList
-    @Column(as: JSONRepresentation<[String]>.self)
+    @Column(as: [String].JSONRepresentation.self)
     let tags: [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.1.1"),
+    .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.2.0"),
   ],
   targets: [
     .target(

SharingGRDB.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -53,28 +53,8 @@ extension Database {
     @InsertValuesBuilder<any StructuredQueriesCore.Table>
     _ build: () -> [any StructuredQueriesCore.Table]
   ) throws {
-    var seeds = build()
-    while !seeds.isEmpty {
-      guard let first = seeds.first else { break }
-      let firstType = type(of: first)
-
-      if let firstType = firstType as? any TableDraft.Type {
-        func insertBatch<T: TableDraft>(_: T.Type) throws {
-          let batch = Array(seeds.lazy.prefix { $0 is T }.compactMap { $0 as? T })
-          defer { seeds.removeFirst(batch.count) }
-          try T.PrimaryTable.insert(batch).execute(self)
-        }
-
-        try insertBatch(firstType)
-      } else {
-        func insertBatch<T: StructuredQueriesCore.Table>(_: T.Type) throws {
-          let batch = Array(seeds.lazy.prefix { $0 is T }.compactMap { $0 as? T })
-          defer { seeds.removeFirst(batch.count) }
-          try T.insert(batch).execute(self)
-        }
-
-        try insertBatch(firstType)
-      }
+    for insert in Seeds(build) {
+      try insert.execute(self)
     }
   }
 }

Sources/StructuredQueriesGRDBCore/Seed.swift

@@ -4,7 +4,6 @@ import GRDB
 import Sharing
 import SharingGRDB
 import StructuredQueries
-import SwiftUI
 import Testing
 
 @Suite(.dependency(\.defaultDatabase, try .database()))