Skip to content

Commit 0f4bb3f

Browse files
nathanfalletnathanfallet
committed
Merge branch 'master' into pr/1048
2 parents 5052cbb + 3dce02e commit 0f4bb3f

35 files changed

+678
-304
lines changed

.github/ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE/template.md

File renamed without changes.

‎.github/workflows/build.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Build and test
2+
on: [push, pull_request]
3+
env:
4+
IOS_SIMULATOR: iPhone 12
5+
IOS_VERSION: 14.4
6+
jobs:
7+
build:
8+
runs-on: macos-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Install
12+
run: |
13+
gem update bundler
14+
gem install xcpretty --no-document
15+
brew update
16+
brew outdated carthage || brew upgrade carthage
17+
- name: "Run tests (BUILD_SCHEME: SQLite iOS)"
18+
env:
19+
BUILD_SCHEME: SQLite iOS
20+
run: ./run-tests.sh
21+
- name: "Run tests (BUILD_SCHEME: SQLite Mac)"
22+
env:
23+
BUILD_SCHEME: SQLite Mac
24+
run: ./run-tests.sh
25+
- name: "Run tests (VALIDATOR_SUBSPEC: none)"
26+
env:
27+
VALIDATOR_SUBSPEC: none
28+
run: ./run-tests.sh
29+
- name: "Run tests (VALIDATOR_SUBSPEC: standard)"
30+
env:
31+
VALIDATOR_SUBSPEC: standard
32+
run: ./run-tests.sh
33+
- name: "Run tests (VALIDATOR_SUBSPEC: standalone)"
34+
env:
35+
VALIDATOR_SUBSPEC: standalone
36+
run: ./run-tests.sh
37+
- name: "Run tests (VALIDATOR_SUBSPEC: SQLCipher)"
38+
env:
39+
VALIDATOR_SUBSPEC: SQLCipher
40+
run: ./run-tests.sh
41+
- name: "Run tests (CARTHAGE_PLATFORM: iOS)"
42+
env:
43+
CARTHAGE_PLATFORM: iOS
44+
run: ./run-tests.sh
45+
- name: "Run tests (CARTHAGE_PLATFORM: Mac)"
46+
env:
47+
CARTHAGE_PLATFORM: Mac
48+
run: ./run-tests.sh
49+
- name: "Run tests (CARTHAGE_PLATFORM: watchOS)"
50+
env:
51+
CARTHAGE_PLATFORM: watchOS
52+
run: ./run-tests.sh
53+
- name: "Run tests (CARTHAGE_PLATFORM: tvOS)"
54+
env:
55+
CARTHAGE_PLATFORM: tvOS
56+
run: ./run-tests.sh
57+
- name: "Run tests (PACKAGE_MANAGER_COMMAND: test)"
58+
env:
59+
PACKAGE_MANAGER_COMMAND: test
60+
run: ./run-tests.sh

‎.travis.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
0.12.3 (18-05-2021), [diff][diff-0.12.2]
2+
========================================
3+
4+
* Swift 5.3 support.
5+
* Xcode 12.5 support.
6+
* Bumps minimum deployment versions.
7+
* Fixes up Package.swift to build SQLiteObjc module.
8+
19
0.11.6 (xxx), [diff][diff-0.11.6]
210
========================================
311

‎Documentation/Index.md‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
- [Sorting Rows](#sorting-rows)
3636
- [Limiting and Paging Results](#limiting-and-paging-results)
3737
- [Aggregation](#aggregation)
38+
- [Upserting Rows](#upserting-rows)
3839
- [Updating Rows](#updating-rows)
3940
- [Deleting Rows](#deleting-rows)
4041
- [Transactions and Savepoints](#transactions-and-savepoints)
@@ -266,8 +267,8 @@ var path = NSSearchPathForDirectoriesInDomains(
266267
).first! + "/" + Bundle.main.bundleIdentifier!
267268
268269
// create parent directory iff it doesn’t exist
269-
try FileManager.default.createDirectoryAtPath(
270-
path, withIntermediateDirectories: true, attributes: nil
270+
try FileManager.default.createDirectory(
271+
atPath: path, withIntermediateDirectories: true, attributes: nil
271272
)
272273
273274
let db = try Connection("\(path)/db.sqlite3")
@@ -967,8 +968,10 @@ equate or compare different types will prevent compilation.
967968
| `~=` | `(Interval, Comparable) -> Bool` | `BETWEEN` |
968969
| `&&` | `Bool -> Bool` | `AND` |
969970
| `\|\|`| `Bool -> Bool` | `OR` |
971+
| `===` | `Equatable -> Bool` | `IS` |
972+
| `!==` | `Equatable -> Bool` | `IS NOT` |
970973

971-
> *When comparing against `nil`, SQLite.swift will use `IS` and `IS NOT`
974+
> * When comparing against `nil`, SQLite.swift will use `IS` and `IS NOT`
972975
> accordingly.
973976

974977

@@ -1110,6 +1113,33 @@ let count = try db.scalar(users.filter(name != nil).count)
11101113
> // SELECT count(DISTINCT "name") FROM "users"
11111114
> ```
11121115

1116+
## Upserting Rows
1117+
1118+
We can upsert rows into a table by calling a [query’s](#queries) `upsert`
1119+
function with a list of [setters](#setters)—typically [typed column
1120+
expressions](#expressions) and values (which can also be expressions)—each
1121+
joined by the `<-` operator. Upserting is like inserting, except if there is a
1122+
conflict on the specified column value, SQLite will perform an update on the row instead.
1123+
1124+
```swift
1125+
try db.run(users.upsert(email <- "alice@mac.com", name <- "Alice"), onConflictOf: email)
1126+
// INSERT INTO "users" ("email", "name") VALUES ('alice@mac.com', 'Alice') ON CONFLICT (\"email\") DO UPDATE SET \"name\" = \"excluded\".\"name\"
1127+
```
1128+
1129+
The `upsert` function, when run successfully, returns an `Int64` representing
1130+
the inserted row’s [`ROWID`][ROWID].
1131+
1132+
```swift
1133+
do {
1134+
let rowid = try db.run(users.upsert(email <- "alice@mac.com", name <- "Alice", onConflictOf: email))
1135+
print("inserted id: \(rowid)")
1136+
} catch {
1137+
print("insertion failed: \(error)")
1138+
}
1139+
```
1140+
1141+
The [`insert`](#inserting-rows), [`update`](#updating-rows), and [`delete`](#deleting-rows) functions
1142+
follow similar patterns.
11131143

11141144
## Updating Rows
11151145

@@ -1569,7 +1599,7 @@ Both of the above methods also have the following optional parameter:
15691599
There are a few restrictions on using Codable types:
15701600

15711601
- The encodable and decodable objects can only use the following types:
1572-
- Int, Bool, Float, Double, String
1602+
- Int, Bool, Float, Double, String, Date
15731603
- Nested Codable types that will be encoded as JSON to a single column
15741604
- These methods will not handle object relationships for you. You must write
15751605
your own Codable and Decodable implementations if you wish to support this.
@@ -1804,12 +1834,12 @@ let config = FTS5Config()
18041834
.column(subject)
18051835
.column(body, [.unindexed])
18061836
1807-
try db.run(emails.create(.FTS5(config))
1837+
try db.run(emails.create(.FTS5(config)))
18081838
// CREATE VIRTUAL TABLE "emails" USING fts5("subject", "body" UNINDEXED)
18091839
18101840
// Note that FTS5 uses a different syntax to select columns, so we need to rewrite
18111841
// the last FTS4 query above as:
1812-
let replies = emails.filter(emails.match("subject:\"Re:\"*))
1842+
let replies = emails.filter(emails.match("subject:\"Re:\"*"))
18131843
// SELECT * FROM "emails" WHERE "emails" MATCH 'subject:"Re:"*'
18141844
18151845
// https://www.sqlite.org/fts5.html#_changes_to_select_statements_

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BUILD_TOOL = xcodebuild
22
BUILD_SCHEME = SQLite Mac
3-
IOS_SIMULATOR = iPhone XS
4-
IOS_VERSION = 13.6
3+
IOS_SIMULATOR = iPhone 12
4+
IOS_VERSION = 14.4
55
ifeq ($(BUILD_SCHEME),SQLite iOS)
66
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
77
else

‎Package.swift‎

Lines changed: 44 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,53 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.3
22
import PackageDescription
33

44
let package = Package(
55
name: "SQLite.swift",
6-
products: [.library(name: "SQLite", targets: ["SQLite"])],
7-
targets: [
8-
.target(name: "SQLite", dependencies: ["SQLiteObjc"]),
9-
.target(name: "SQLiteObjc"),
10-
.testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests")
6+
products: [
7+
.library(
8+
name: "SQLite",
9+
targets: ["SQLite"]
10+
)
1111
],
12-
swiftLanguageVersions: [4, 5]
12+
targets: [
13+
.target(
14+
name: "SQLite",
15+
dependencies: ["SQLiteObjc"],
16+
exclude: [
17+
"Info.plist"
18+
]
19+
),
20+
.target(
21+
name: "SQLiteObjc",
22+
dependencies: [],
23+
exclude: [
24+
"fts3_tokenizer.h"
25+
]
26+
),
27+
.testTarget(
28+
name: "SQLiteTests",
29+
dependencies: [
30+
"SQLite"
31+
],
32+
path: "Tests/SQLiteTests",
33+
exclude: [
34+
"Info.plist"
35+
],
36+
resources: [
37+
.copy("fixtures/encrypted-3.x.sqlite"),
38+
.copy("fixtures/encrypted-4.x.sqlite")
39+
]
40+
)
41+
]
1342
)
1443

1544
#if os(Linux)
16-
package.dependencies = [.package(url: "https://github.com/stephencelis/CSQLite.git", from: "0.0.3")]
17-
package.targets = [
18-
.target(name: "SQLite", exclude: ["Extensions/FTS4.swift", "Extensions/FTS5.swift"]),
19-
.testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests", exclude: [
20-
"FTS4Tests.swift",
21-
"FTS5Tests.swift"
22-
])
23-
]
45+
package.dependencies = [.package(url: "https://github.com/stephencelis/CSQLite.git", from: "0.0.3")]
46+
package.targets = [
47+
.target(name: "SQLite", exclude: ["Extensions/FTS4.swift", "Extensions/FTS5.swift"]),
48+
.testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests", exclude: [
49+
"FTS4Tests.swift",
50+
"FTS5Tests.swift"
51+
])
52+
]
2453
#endif

0 commit comments

Comments
 (0)