Merge pull request #1352 from stephencelis/remove-swift-toolchain-sqlite

jberkel · web-flow · commit 0006e2883f5e · 2026-02-26T22:12:49.000+01:00
Remove SwiftToolchainCSQLite
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,10 +30,6 @@ jobs:
       env:
         PACKAGE_MANAGER_COMMAND: test -Xswiftc -warnings-as-errors
       run: ./run-tests.sh
-    - name: "Run tests (PACKAGE_MANAGER_COMMAND: test --traits SwiftToolchainCSQLite)"
-      env:
-        PACKAGE_MANAGER_COMMAND: test -Xswiftc -warnings-as-errors --traits SwiftToolchainCSQLite
-      run: ./run-tests.sh
     - name: "Run tests (PACKAGE_MANAGER_COMMAND: test --traits SQLiteSwiftCSQLite)"
       env:
         PACKAGE_MANAGER_COMMAND: test -Xswiftc -warnings-as-errors --traits SQLiteSwiftCSQLite
@@ -84,8 +80,8 @@ jobs:
         sudo apt-get install -y libsqlite3-dev
     - name: Test (default trait)
       run: swift test
-    - name: Test (SwiftToolchainCSQLite)
-      run: swift test --traits SwiftToolchainCSQLite
+    - name: Test (SQLiteSwiftCSQLite)
+      run: swift test --traits SQLiteSwiftCSQLite
     - name: "Run tests (SPM integration test)"
       env:
         SPM: run
@@ -99,4 +95,4 @@ jobs:
       with:
         # Ubuntu runners low on space causes the emulator to fail to install
         free-disk-space: true
-        swift-build-flags: --traits SwiftToolchainCSQLite
+        swift-build-flags: --traits SQLiteSwiftCSQLite
diff --git a/Documentation/Index.md b/Documentation/Index.md
@@ -132,14 +132,13 @@ SQLite.swift for different use cases.
   ]
   ```
 
-| Trait                    | Description                                         | SQLite version                       |
-|--------------------------|-----------------------------------------------------|--------------------------------------|
-| `SystemSQLite` (default) | Uses the system SQLite (provided by Apple)          | macOS 15.7.x: `3.43.2`, 26: `3.50.2` |
-| `SwiftToolchainCSQLite`  | Embeds the SQLite provided by [swift-toolchain][]   | 1.0.7: `3.50.4`                      |
-| `SQLiteSwiftCSQLite`     | Embeds a [custom SQLite][] based on swift-toolchain | `3.50.4`                             |
-| `StandaloneSQLite`       | Only used by CocoaPods                              |                                      |
-| `SQLCipher`              | Embeds [SQLCipher][] (see below)                    | 4.13.0: `3.51.2`                     |
-| `FTS5`                   | Enables FTS5, only works with `SQLiteSwiftCSQLite`  |                                      |
+| Trait                    | Description                                             | SQLite version                       |
+|--------------------------|---------------------------------------------------------|--------------------------------------|
+| `SystemSQLite` (default) | Uses the system SQLite (provided by Apple)              | macOS 15.7.x: `3.43.2`, 26: `3.50.2` |
+| `SQLiteSwiftCSQLite`     | Embeds a [custom SQLite][] based on [swift-toolchain][] | `3.50.4`                             |
+| `StandaloneSQLite`       | Only used by CocoaPods                                  |                                      |
+| `SQLCipher`              | Embeds [SQLCipher][] (see below)                        | 4.13.0: `3.51.2`                     |
+| `FTS5`                   | Enables FTS5, only works with `SQLiteSwiftCSQLite`      |                                      |
 
 [traits]: https://docs.swift.org/swiftpm/documentation/packagemanagerdocs/packagetraits/
 [custom SQLite]: https://github.com/stephencelis/CSQLite/tree/SQLite.swift
diff --git a/Documentation/Linux.md b/Documentation/Linux.md
@@ -7,14 +7,14 @@ See [#1071](https://github.com/stephencelis/SQLite.swift/issues/1071).
 
 ## Installation
 
-On Linux you should enable the `SwiftToolchainCSQLite` trait to automatically
+On Linux you should enable the `SQLiteSwiftCSQLite` trait to automatically
 embed SQLite:
 
   ```swift
   dependencies: [
     .package(url: "https://github.com/stephencelis/SQLite.swift.git", 
              from: "0.15.6",
-             traits: ["SwiftToolchainCSQLite"])
+             traits: ["SQLiteSwiftCSQLite"])
   ]
   ```
 
diff --git a/Package.swift b/Package.swift
@@ -5,9 +5,6 @@ let applePlatforms: [PackageDescription.Platform] = [.iOS, .macOS, .watchOS, .tv
 let target: Target = .target(
     name: "SQLite",
     dependencies: [
-        .product(name: "SwiftToolchainCSQLite",
-                 package: "swift-toolchain-sqlite",
-                 condition: .when(traits: ["SwiftToolchainCSQLite"])),
         .product(name: "SQLiteSwiftCSQLite",
                  package: "CSQLite",
                  condition: .when(traits: ["SQLiteSwiftCSQLite"])),
@@ -31,7 +28,7 @@ let testTarget: Target = .testTarget(
 
 let defaultTraits: Set<String>
 #if os(Linux)
-defaultTraits = ["SwiftToolchainCSQLite"]
+defaultTraits = ["SQLiteSwiftCSQLite"]
 #else
 defaultTraits = ["SystemSQLite"]
 #endif
@@ -52,8 +49,6 @@ let package = Package(
     traits: [
         .trait(name: "SystemSQLite",
               description: "Uses the system-provided SQLite (on Apple platforms)"),
-        .trait(name: "SwiftToolchainCSQLite",
-               description: "Include SQLite from the Swift toolchain"),
         .trait(name: "SQLiteSwiftCSQLite",
                description: "Include SQLite from SQLite.swift, based on the toolchain version"),
         // this will note compile, just included for sake of completeness
@@ -66,7 +61,6 @@ let package = Package(
         .default(enabledTraits: defaultTraits)
     ],
     dependencies: [
-        .package(url: "https://github.com/swiftlang/swift-toolchain-sqlite", from: "1.0.7"),
         .package(url: "https://github.com/stephencelis/CSQLite", from: "3.50.4", traits: [.trait(name: "FTS5", condition: .when(traits: ["FTS5"]))]),
         .package(url: "https://github.com/sqlcipher/SQLCipher.swift", from: "4.11.0")
     ],
diff --git a/Sources/SQLite/Core/Backup.swift b/Sources/SQLite/Core/Backup.swift
@@ -28,8 +28,6 @@ import Dispatch
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Sources/SQLite/Core/Connection+Aggregation.swift b/Sources/SQLite/Core/Connection+Aggregation.swift
@@ -3,8 +3,6 @@ import Foundation
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Sources/SQLite/Core/Connection.swift b/Sources/SQLite/Core/Connection.swift
@@ -28,8 +28,6 @@ import Dispatch
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Sources/SQLite/Core/Result.swift b/Sources/SQLite/Core/Result.swift
@@ -2,8 +2,6 @@
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Sources/SQLite/Core/Statement.swift b/Sources/SQLite/Core/Statement.swift
@@ -26,8 +26,6 @@
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Sources/SQLite/Helpers.swift b/Sources/SQLite/Helpers.swift
@@ -26,8 +26,6 @@
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Tests/SQLiteTests/Core/Connection+AttachTests.swift b/Tests/SQLiteTests/Core/Connection+AttachTests.swift
@@ -6,8 +6,6 @@ import Foundation
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Tests/SQLiteTests/Core/ConnectionTests.swift b/Tests/SQLiteTests/Core/ConnectionTests.swift
@@ -7,8 +7,6 @@ import Dispatch
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
@@ -453,9 +451,6 @@ class ConnectionTests: SQLiteTestCase {
 
         #if SystemSQLite
         XCTAssertGreaterThanOrEqual(version, .init(major: 3, minor: 43, point: 2))
-        #elseif SwiftToolchainCSQLite
-        // 1.0.7 uses SQLite 3.50.4
-        XCTAssertGreaterThanOrEqual(version, .init(major: 3, minor: 50, point: 4))
         #elseif SQLiteSwiftCSQLite
         XCTAssertGreaterThanOrEqual(version, .init(major: 3, minor: 50, point: 4))
         #elseif SQLCipher
diff --git a/Tests/SQLiteTests/Core/ResultTests.swift b/Tests/SQLiteTests/Core/ResultTests.swift
@@ -6,8 +6,6 @@ import Foundation
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Tests/SQLiteTests/Core/StatementTests.swift b/Tests/SQLiteTests/Core/StatementTests.swift
@@ -5,8 +5,6 @@ import XCTest
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
diff --git a/Tests/SQLiteTests/Typed/QueryIntegrationTests.swift b/Tests/SQLiteTests/Typed/QueryIntegrationTests.swift
@@ -3,8 +3,6 @@ import XCTest
 import sqlite3
 #elseif SQLCipher
 import SQLCipher
-#elseif SwiftToolchainCSQLite
-import SwiftToolchainCSQLite
 #elseif SQLiteSwiftCSQLite
 import SQLiteSwiftCSQLite
 #else
