wip local dependencies for structured queries

.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(swift --version:*)",
+      "Bash(~/.swiftly/bin/swiftly list:*)",
+      "Bash(~/.swiftly/bin/swiftly use:*)"
+    ]
+  }
+}

Package.swift

@@ -1,107 +1,108 @@
-// swift-tools-version: 6.1
+// swift-tools-version: 6.2.1
 
 import PackageDescription
 
 let package = Package(
-  name: "sqlite-data",
-  platforms: [
-    .macOS(.v15),
-  ],
-  products: [
-    .library(
-      name: "SQLiteData",
-      targets: ["SQLiteData"]
-    ),
-    .library(
-      name: "SQLiteDataTestSupport",
-      targets: ["SQLiteDataTestSupport"]
-    ),
-  ],
-  traits: [
-    .trait(
-      name: "SQLiteDataTagged",
-      description: "Introduce SQLiteData conformances to the swift-tagged package."
-    )
-  ],
-  dependencies: [
-    .package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
-    .package(url: "https://github.com/groue/GRDB.swift", from: "7.6.0"),
-    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
-    .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
-    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
-    .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
-    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
-    .package(
-      url: "https://github.com/pointfreeco/swift-structured-queries",
-      from: "0.24.0",
-      traits: [
-        .trait(name: "StructuredQueriesTagged", condition: .when(traits: ["SQLiteDataTagged"]))
-      ]
-    ),
-    .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"),
-    .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
-  ],
-  targets: [
-    .target(
-      name: "SQLiteData",
-      dependencies: [
-        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
-        .product(name: "Dependencies", package: "swift-dependencies"),
-        .product(name: "GRDB", package: "GRDB.swift"),
-        .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
-        .product(name: "OrderedCollections", package: "swift-collections"),
-        .product(name: "Sharing", package: "swift-sharing"),
-        .product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"),
-        .product(
-          name: "Tagged",
-          package: "swift-tagged",
-          condition: .when(traits: ["SQLiteDataTagged"])
+    name: "sqlite-data",
+    platforms: [
+        .macOS(.v15)
+    ],
+    products: [
+        .library(
+            name: "SQLiteData",
+            targets: ["SQLiteData"]
+        ),
+        .library(
+            name: "SQLiteDataTestSupport",
+            targets: ["SQLiteDataTestSupport"]
+        ),
+    ],
+    traits: [
+        .trait(
+            name: "SQLiteDataTagged",
+            description: "Introduce SQLiteData conformances to the swift-tagged package."
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
+        .package(name: "GRDB.swift", path: "../GRDB-swift"),
+        .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
+        .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
+        .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
+        .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
+        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
+        .package(
+            path: "../swift-structured-queries",
+            traits: [
+                .trait(
+                    name: "StructuredQueriesTagged",
+                    condition: .when(traits: ["SQLiteDataTagged"]))
+            ]
+        ),
+        .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"),
+        .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
+    ],
+    targets: [
+        .target(
+            name: "SQLiteData",
+            dependencies: [
+                .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+                .product(name: "Dependencies", package: "swift-dependencies"),
+                .product(name: "GRDB", package: "GRDB.swift"),
+                .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
+                .product(name: "OrderedCollections", package: "swift-collections"),
+                .product(name: "Sharing", package: "swift-sharing"),
+                .product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"),
+                .product(
+                    name: "Tagged",
+                    package: "swift-tagged",
+                    condition: .when(traits: ["SQLiteDataTagged"])
+                ),
+            ]
         ),
-      ]
-    ),
-    .target(
-      name: "SQLiteDataTestSupport",
-      dependencies: [
-        "SQLiteData",
-        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
-        .product(name: "CustomDump", package: "swift-custom-dump"),
-        .product(name: "Dependencies", package: "swift-dependencies"),
-        .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
-        .product(name: "StructuredQueriesTestSupport", package: "swift-structured-queries"),
-      ]
-    ),
-    .testTarget(
-      name: "SQLiteDataTests",
-      dependencies: [
-        "SQLiteData",
-        "SQLiteDataTestSupport",
-        .product(name: "DependenciesTestSupport", package: "swift-dependencies"),
-        .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
-        .product(name: "SnapshotTestingCustomDump", package: "swift-snapshot-testing"),
-        .product(name: "StructuredQueries", package: "swift-structured-queries"),
-      ]
-    ),
-  ],
-  swiftLanguageModes: [.v6]
+        .target(
+            name: "SQLiteDataTestSupport",
+            dependencies: [
+                "SQLiteData",
+                .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+                .product(name: "CustomDump", package: "swift-custom-dump"),
+                .product(name: "Dependencies", package: "swift-dependencies"),
+                .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
+                .product(name: "StructuredQueriesTestSupport", package: "swift-structured-queries"),
+            ]
+        ),
+        .testTarget(
+            name: "SQLiteDataTests",
+            dependencies: [
+                "SQLiteData",
+                "SQLiteDataTestSupport",
+                .product(name: "DependenciesTestSupport", package: "swift-dependencies"),
+                .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
+                .product(name: "SnapshotTestingCustomDump", package: "swift-snapshot-testing"),
+                .product(name: "StructuredQueries", package: "swift-structured-queries"),
+            ]
+        ),
+    ],
+    swiftLanguageModes: [.v6]
 )
 
 let swiftSettings: [SwiftSetting] = [
-  .enableUpcomingFeature("MemberImportVisibility")
-  // .unsafeFlags([
-  //   "-Xfrontend",
-  //   "-warn-long-function-bodies=50",
-  //   "-Xfrontend",
-  //   "-warn-long-expression-type-checking=50",
-  // ])
+    .enableUpcomingFeature("MemberImportVisibility")
+    // .unsafeFlags([
+    //   "-Xfrontend",
+    //   "-warn-long-function-bodies=50",
+    //   "-Xfrontend",
+    //   "-warn-long-expression-type-checking=50",
+    // ])
 ]
 
 for index in package.targets.indices {
-  package.targets[index].swiftSettings = swiftSettings
+    package.targets[index].swiftSettings = swiftSettings
 }
 
 #if !os(Windows)
-  // Add the documentation compiler plugin if possible
-  package.dependencies.append(
-    .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
-  )
+    // Add the documentation compiler plugin if possible
+    package.dependencies.append(
+        .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
+    )
 #endif

Sources/SQLiteData/CloudKit/CloudKit+StructuredQueries.swift

@@ -284,7 +284,7 @@
 
       self.userModificationTime = other.userModificationTime
       for column in T.TableColumns.writableColumns {
-        func open<Root, Value>(_ column: some WritableTableColumnExpression<Root, Value>) {
+        func open<Value>(_ column: some WritableTableColumnExpression<T, Value>) {
           let key = column.name
           let keyPath = column.keyPath as! KeyPath<T, Value.QueryOutput>
           let didSet: Bool