wip local dependencies for structured queries (#3)

Author: doozMen

.claude/settings.local.json

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

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.1
+// swift-tools-version: 6.2.1
 
 import PackageDescription
 
@@ -25,12 +25,13 @@ let package = 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"),
+    // NB: Fork synced with upstream v7.9.0
+    .package(url: "https://github.com/doozMen/GRDB.swift", branch: "master"),
     .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-perception", from: "2.0.0"),
-    .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
+    // NB: Fork with Swift 6.3 fixes (uses doozMen/swift-perception)
+    .package(url: "https://github.com/doozMen/swift-sharing", branch: "main"),
     .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
     .package(
       url: "https://github.com/pointfreeco/swift-structured-queries",
@@ -51,7 +52,6 @@ let package = Package(
         .product(name: "GRDB", package: "GRDB.swift"),
         .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
         .product(name: "OrderedCollections", package: "swift-collections"),
-        .product(name: "Perception", package: "swift-perception"),
         .product(name: "Sharing", package: "swift-sharing"),
         .product(name: "StructuredQueriesSQLite", package: "swift-structured-queries"),
         .product(
@@ -103,7 +103,8 @@ for index in package.targets.indices {
 
 #if !os(Windows)
   // Add the documentation compiler plugin if possible
+  // NB: Use explicit type to avoid Swift 6.2.3 circular reference bug
   package.dependencies.append(
-    .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
+    Package.Dependency.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
   )
 #endif

Package.swift

@@ -291,7 +291,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

Package@swift-6.0.swift

@@ -181,25 +181,18 @@
         newColumns.append(columns.primaryKey.name)
       }
       newColumns.append(contentsOf: tableInfo.map(\.name))
-      convertedColumns.append(
-        contentsOf: tableInfo.map { tableInfo -> QueryFragment in
-          if tableInfo.name == primaryKey.name, tableInfo.isInt {
-            return $backfillUUID(id: #sql("\(quote: tableInfo.name)"), table: tableName, salt: salt)
-              .queryFragment
-          } else if tableInfo.isInt,
-            let foreignKey = foreignKeys.first(where: { $0.from == tableInfo.name })
-          {
-            return $backfillUUID(
-              id: #sql("\(quote: foreignKey.from)"),
-              table: foreignKey.table,
-              salt: salt
-            )
-            .queryFragment
-          } else {
-            return QueryFragment(quote: tableInfo.name)
-          }
-        }
-      )
+      // NB: Swift 6.3-dev crashes on complex closures with #sql macro interpolation.
+      // Extracted to helper function to work around compiler bug.
+      for info in tableInfo {
+        let fragment = convertTableInfoToQueryFragment(
+          info,
+          primaryKeyName: primaryKey.name,
+          foreignKeys: foreignKeys,
+          tableName: tableName,
+          salt: salt
+        )
+        convertedColumns.append(fragment)
+      }
 
       try #sql(QueryFragment(stringLiteral: newSchema)).execute(db)
       try #sql(
@@ -225,6 +218,32 @@
       )
       .execute(db)
     }
+
+    // NB: Extracted from closure to work around Swift 6.3-dev compiler crash.
+    // The compiler crashes on complex closures mixing #sql macro interpolation with nested closures.
+    private static func convertTableInfoToQueryFragment(
+      _ tableInfo: PragmaTableInfo<Self>,
+      primaryKeyName: String,
+      foreignKeys: [PragmaForeignKeyList<Self>],
+      tableName: String,
+      salt: String
+    ) -> QueryFragment {
+      if tableInfo.name == primaryKeyName, tableInfo.isInt {
+        return $backfillUUID(id: #sql("\(quote: tableInfo.name)"), table: tableName, salt: salt)
+          .queryFragment
+      } else if tableInfo.isInt,
+        let foreignKey = foreignKeys.first(where: { $0.from == tableInfo.name })
+      {
+        return $backfillUUID(
+          id: #sql("\(quote: foreignKey.from)"),
+          table: foreignKey.table,
+          salt: salt
+        )
+        .queryFragment
+      } else {
+        return QueryFragment(quote: tableInfo.name)
+      }
+    }
   }
 
   extension StringProtocol {