Restore Swift 6.1 support

.github/workflows/ci.yml

@@ -37,13 +37,12 @@ jobs:
     name: Linux
     strategy:
       matrix:
-        swift:
-          - "6.3"
+        swift: ["6.1", "6.3"]
     runs-on: ubuntu-latest
     container: swift:${{ matrix.swift }}
     steps:
       - uses: actions/checkout@v5
       - name: Install SQLite
         run: apt update && apt -y install libsqlite3-dev
       - name: Build
-        run: swift build
+        run: swift build --build-tests

Package.swift

@@ -77,11 +77,7 @@ let package = Package(
   dependencies: [
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.8.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
-    .package(
-      url: "https://github.com/pointfreeco/swift-dependencies",
-      from: "1.14.0",
-      traits: ["Foundation"]
-    ),
+    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.14.0"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.6.3"),
     .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
     .package(url: "https://github.com/pointfreeco/swift-tagged", from: "0.10.0"),

Sources/StructuredQueries/Macros.swift

@@ -42,6 +42,15 @@ public import StructuredQueriesCore
     named(allCasePaths),
     named(_$Element)
   )
+  @attached(memberAttribute)
+  public macro Table(
+    _ name: String = "",
+    schema schemaName: String = ""
+  ) =
+    #externalMacro(
+      module: "StructuredQueriesMacros",
+      type: "TableMacro"
+    )
 #else
   @attached(
     extension,
@@ -67,16 +76,16 @@ public import StructuredQueriesCore
     named(tableName),
     named(CodingKeys)
   )
+  @attached(memberAttribute)
+  public macro Table(
+    _ name: String = "",
+    schema schemaName: String = ""
+  ) =
+    #externalMacro(
+      module: "StructuredQueriesMacros",
+      type: "TableMacro"
+    )
 #endif
-@attached(memberAttribute)
-public macro Table(
-  _ name: String = "",
-  schema schemaName: String = ""
-) =
-  #externalMacro(
-    module: "StructuredQueriesMacros",
-    type: "TableMacro"
-  )
 
 /// Defines a "selection" of columns that can be decoded from a query.
 ///
@@ -144,6 +153,14 @@ public macro Table(
     named(allCasePaths),
     named(_$Element)
   )
+  @attached(memberAttribute)
+  public macro Selection(
+    _ name: String = ""
+  ) =
+    #externalMacro(
+      module: "StructuredQueriesMacros",
+      type: "TableMacro"
+    )
 #else
   @attached(
     extension,
@@ -171,15 +188,15 @@ public macro Table(
     named(tableName),
     named(CodingKeys)
   )
+  @attached(memberAttribute)
+  public macro Selection(
+    _ name: String = ""
+  ) =
+    #externalMacro(
+      module: "StructuredQueriesMacros",
+      type: "TableMacro"
+    )
 #endif
-@attached(memberAttribute)
-public macro Selection(
-  _ name: String = ""
-) =
-  #externalMacro(
-    module: "StructuredQueriesMacros",
-    type: "TableMacro"
-  )
 
 /// Customizes a column generated by the ``/StructuredQueriesCore/Table`` protocol.
 ///

Sources/StructuredQueriesCore/Operators.swift

@@ -395,17 +395,6 @@ extension QueryExpression where QueryValue == Bool {
   }
 }
 
-// NB: This overload is required due to an overload resolution bug of 'Updates[dynamicMember:]'.
-@_documentation(visibility: private)
-public prefix func ! (
-  expression: any QueryExpression<Bool>
-) -> some QueryExpression<Bool> {
-  func open(_ expression: some QueryExpression<Bool>) -> SQLQueryExpression<Bool> {
-    SQLQueryExpression(expression.not())
-  }
-  return open(expression)
-}
-
 extension SQLQueryExpression<Bool> {
   public mutating func toggle() {
     self = Self(not())

Sources/StructuredQueriesCore/ScalarFunctions.swift

@@ -75,12 +75,12 @@ extension QueryExpression where QueryValue: _OptionalPromotable {
   ///   `NULL` when both expressions are equal.
   public func nullif<Other: QueryExpression>(
     _ other: Other
-  ) -> some QueryExpression<QueryValue._Optionalized>
+  ) -> SQLQueryExpression<QueryValue._Optionalized>
   where
     Other.QueryValue: _OptionalPromotable,
     Other.QueryValue._Optionalized == QueryValue._Optionalized
   {
-    QueryFunction("nullif", self, other)
+    SQLQueryExpression(QueryFunction("nullif", self, other))
   }
 }
 

Tests/StructuredQueriesMacrosTests/TableMacroTests.swift

@@ -2840,7 +2840,7 @@ extension SnapshotTests {
       }
     }
 
-    @Test func `@Selection with empty struct`() {
+    @Test("@Selection with empty struct") func selectionWithEmptyStruct() {
       assertMacro {
         """
         @Selection
@@ -4063,7 +4063,7 @@ extension SnapshotTests {
       }
     }
 
-    @Test func `selection enum requires CasePaths trait`() {
+    @Test("selection enum requires CasePaths trait") func selectionEnumRequiresCasePathsTrait() {
       assertMacro {
         """
         @Selection enum Post {

Tests/StructuredQueriesTests/DatabaseFunctionTests.swift

@@ -1,13 +1,18 @@
 import Dependencies
 import Foundation
 import InlineSnapshotTesting
-import SQLite3
 import StructuredQueries
 import StructuredQueriesSQLite
 import StructuredQueriesTestSupport
 import Testing
 import _StructuredQueriesSQLite
 
+#if canImport(Darwin)
+  import SQLite3
+#else
+  import _StructuredQueriesSQLite3
+#endif
+
 extension SnapshotTests {
   @Suite struct DatabaseFunctionTests {
     @Dependency(\.defaultDatabase) var database

Tests/StructuredQueriesTests/DecodingTests.swift

@@ -243,7 +243,8 @@ extension SnapshotTests {
       )
     }
 
-    @Test func `NULL value in optional column does not decode as default`() throws {
+    @Test("NULL value in optional column does not decode as default")
+    func nullValueInOptionalColumnDoesNotDecodeAsDefault() throws {
       try withDependencies {
         $0.defaultDatabase = db
       } operation: {

Tests/StructuredQueriesTests/EnumTableTests.swift

@@ -644,7 +644,8 @@
         }
       }
 
-      @Test func `enum case with defaults isn't always decoded successfully`() {
+      @Test("enum case with defaults isn't always decoded successfully")
+      func enumCaseWithDefaultsIsntAlwaysDecodedSuccessfully() {
         assertQuery(
           Attachment.upsert {
             Attachment

Tests/StructuredQueriesTests/InsertTests.swift

@@ -715,27 +715,32 @@ extension SnapshotTests {
       }
     }
 
-    // NB: This currently crashes in Xcode 26.
-    #if swift(<6.2)
-      @Test func onConflict_invalidUpdateFilters() {
-        withKnownIssue {
-          assertQuery(
-            Reminder.insert {
-              Reminder.Draft(remindersListID: 1)
-            } where: {
-              $0.isFlagged
-            }
-          ) {
-            """
-            INSERT INTO "reminders"
-            ("id", "assignedUserID", "dueDate", "isCompleted", "isFlagged", "notes", "priority", "remindersListID", "title", "updatedAt")
-            VALUES
-            (NULL, NULL, NULL, 0, 0, '', NULL, 1, '', '2040-02-14 23:31:30.000')
-            """
+    @Test func onConflict_invalidUpdateFilters() {
+      print(
+        Reminder.insert {
+          Reminder.Draft(remindersListID: 1)
+        } where: {
+          $0.isFlagged
+        }
+          .query.debugDescription
+      )
+      withKnownIssue {
+        assertQuery(
+          Reminder.insert {
+            Reminder.Draft(remindersListID: 1)
+          } where: {
+            $0.isFlagged
           }
+        ) {
+          """
+          INSERT INTO "reminders"
+          ("id", "assignedUserID", "dueDate", "isCompleted", "isFlagged", "notes", "priority", "remindersListID", "title", "updatedAt")
+          VALUES
+          (NULL, NULL, NULL, 0, 0, '', NULL, 1, '', '2040-02-14 23:31:30.000')
+          """
         }
       }
-    #endif
+    }
 
     @Test func onConflict_conditionalWhere() {
       let condition = false

Tests/StructuredQueriesTests/JSONBTests.swift

@@ -677,7 +677,7 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `jsonSet on a JSONBRepresentation`() {
+    @Test("jsonSet on a JSONBRepresentation") func jsonSetOnAJSONBRepresentation() {
       assertQuery(
         Post.select { $0.notes.jsonSet(\.[0], "z") }
       ) {
@@ -1271,7 +1271,7 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `Multiple jsonSet's are fused`() throws {
+    @Test("Multiple jsonSet's are fused") func multipleJsonSetsAreFused() throws {
       try db.execute(Profile.delete())
       assertQuery(
         Profile.update {
@@ -1291,7 +1291,7 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `Multiple jsonReplace's are fused`() throws {
+    @Test("Multiple jsonReplace's are fused") func multipleJsonReplacesAreFused() throws {
       try db.execute(Profile.delete())
       assertQuery(
         Profile.update {
@@ -1311,7 +1311,7 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `Multiple jsonInsert's are fused`() throws {
+    @Test("Multiple jsonInsert's are fused") func multipleJsonInsertsAreFused() throws {
       try db.execute(Profile.delete())
       assertQuery(
         Profile.update {

Tests/StructuredQueriesTests/JSONEachTests.swift

@@ -366,7 +366,9 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `aggregate scalar quantities in JSON arrays`() throws {
+    @Test("aggregate scalar quantities in JSON arrays") func aggregateScalarQuantitiesInJSONArrays()
+      throws
+    {
       try db.execute(
         Profile.insert {
           Profile.Draft(favoriteNumbers: [42, 1729])
@@ -682,7 +684,7 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `jsonEach over a JSONBRepresentation`() {
+    @Test("jsonEach over a JSONBRepresentation") func jsonEachOverAJSONBRepresentation() {
       assertQuery(
         BlobTrip
           .join(BlobTrip.columns.geofence.jsonEach()) { _, _ in true }

Tests/StructuredQueriesTests/JSONFunctionsTests.swift

@@ -719,7 +719,9 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `jsonbExtract from a JSONRepresentation`() throws {
+    @Test("jsonbExtract from a JSONRepresentation") func jsonbExtractFromAJSONRepresentation()
+      throws
+    {
       try db.execute(Doc.delete())
       try db.execute(
         Doc.insert {
@@ -746,7 +748,7 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `jsonbSet on a JSONRepresentation`() throws {
+    @Test("jsonbSet on a JSONRepresentation") func jsonbSetOnAJSONRepresentation() throws {
       try db.execute(Doc.delete())
       try db.execute(
         Doc.insert {
@@ -773,7 +775,8 @@ extension SnapshotTests {
     }
 
     @available(iOS 26, macOS 26, tvOS 26, watchOS 26, *)
-    @Test func `jsonbAppend and jsonbRemove on a JSONRepresentation`() throws {
+    @Test("jsonbAppend and jsonbRemove on a JSONRepresentation")
+    func jsonbAppendAndJsonbRemoveOnAJSONRepresentation() throws {
       try db.execute(Doc.delete())
       try db.execute(
         Doc.insert {

Tests/StructuredQueriesTests/MapTests.swift

@@ -1,13 +1,18 @@
 import Dependencies
 import Foundation
 import InlineSnapshotTesting
-import SQLite3
 import StructuredQueries
 import StructuredQueriesSQLite
 import StructuredQueriesTestSupport
 import Testing
 import _StructuredQueriesSQLite
 
+#if canImport(Darwin)
+  import SQLite3
+#else
+  import _StructuredQueriesSQLite3
+#endif
+
 extension SnapshotTests {
   @Suite struct MapTests {
     @Dependency(\.defaultDatabase) var database