Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
15 changes: 7 additions & 8 deletions Documentation/Index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Documentation/Linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
]
```

Expand Down
8 changes: 1 addition & 7 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"])),
Expand All @@ -31,7 +28,7 @@ let testTarget: Target = .testTarget(

let defaultTraits: Set<String>
#if os(Linux)
defaultTraits = ["SwiftToolchainCSQLite"]
defaultTraits = ["SQLiteSwiftCSQLite"]
#else
defaultTraits = ["SystemSQLite"]
#endif
Expand All @@ -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
Expand All @@ -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")
],
Expand Down
2 changes: 0 additions & 2 deletions Sources/SQLite/Core/Backup.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import Dispatch
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Sources/SQLite/Core/Connection+Aggregation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import Foundation
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Sources/SQLite/Core/Connection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import Dispatch
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Sources/SQLite/Core/Result.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Sources/SQLite/Core/Statement.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Sources/SQLite/Helpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Tests/SQLiteTests/Core/Connection+AttachTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import Foundation
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
5 changes: 0 additions & 5 deletions Tests/SQLiteTests/Core/ConnectionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import Dispatch
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Tests/SQLiteTests/Core/ResultTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import Foundation
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Tests/SQLiteTests/Core/StatementTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import XCTest
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
2 changes: 0 additions & 2 deletions Tests/SQLiteTests/Typed/QueryIntegrationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import XCTest
import sqlite3
#elseif SQLCipher
import SQLCipher
#elseif SwiftToolchainCSQLite
import SwiftToolchainCSQLite
#elseif SQLiteSwiftCSQLite
import SQLiteSwiftCSQLite
#else
Expand Down
Loading