Skip to content

Commit 8465ce8

Browse files
authored
Merge branch 'master' into vision-os
2 parents ce125ce + 0435dd1 commit 8465ce8

File tree

12 files changed

+253
-33
lines changed

12 files changed

+253
-33
lines changed

CHANGELOG.md

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1-
0.15.0 (unreleased)
1+
0.15.0 (24-02-2024), [diff][diff-0.15.0]
22
========================================
33

4+
* Fix incorrect behavior when preparing `SELECT *` preceded by a `WITH` ([#1179][])
5+
* Adds support for returning extended error codes ([#1178][])
6+
* Fix typos ([#1182][])
7+
* fix Xcode build error ([#1192][])
8+
* Make the IndexDefinition properties public ([#1196][])
9+
* Fix GitHub Actions build badge ([#1200][])
10+
* Run CI on macOS 13 ([#1206][])
11+
* SchemaReader: return the correct column definition for a composite primary key ([#1217][])
12+
* Add optional support for decoding ([#1224][])
13+
* make fromDatatypeValue throw ([#1242][])
14+
* Implements built-in window functions ([#1228][])
15+
* Fix column affinity parsing to match how SQLite determines affinity ([#1218][])
16+
* Handle FK definitions w/o key references ([#1210][])
17+
* Add privacy manifest ([#1245][])
418
* New minimum deployment targets: iOS/tvOS 11.0, watchOS 4.0
519

620
0.14.1 (01-11-2022), [diff][diff-0.14.1]
@@ -14,7 +28,7 @@ For breaking changes, see [Upgrading.md](Documentation/Upgrading.md).
1428

1529
* Support more complex schema changes and queries ([#1073][], [#1146][] [#1148][])
1630
* Support `ATTACH`/`DETACH` ([#30][], [#1142][])
17-
* Expose connection flags (via `URIQueryParameter`) to open db ([#1074][]))
31+
* Expose connection flags (via `URIQueryParameter`) to open db ([#1074][])
1832
* Support `WITH` clause ([#1139][])
1933
* Add `Value` conformance for `NSURL` ([#1110][], [#1141][])
2034
* Add decoding for `UUID` ([#1137][])
@@ -140,6 +154,7 @@ For breaking changes, see [Upgrading.md](Documentation/Upgrading.md).
140154
[diff-0.13.3]: https://github.com/stephencelis/SQLite.swift/compare/0.13.2...0.13.3
141155
[diff-0.14.0]: https://github.com/stephencelis/SQLite.swift/compare/0.13.3...0.14.0
142156
[diff-0.14.1]: https://github.com/stephencelis/SQLite.swift/compare/0.14.0...0.14.1
157+
[diff-0.15.0]: https://github.com/stephencelis/SQLite.swift/compare/0.14.0...0.15.0
143158

144159
[#30]: https://github.com/stephencelis/SQLite.swift/issues/30
145160
[#142]: https://github.com/stephencelis/SQLite.swift/issues/142
@@ -206,3 +221,17 @@ For breaking changes, see [Upgrading.md](Documentation/Upgrading.md).
206221
[#1146]: https://github.com/stephencelis/SQLite.swift/pull/1146
207222
[#1148]: https://github.com/stephencelis/SQLite.swift/pull/1148
208223
[#1167]: https://github.com/stephencelis/SQLite.swift/pull/1167
224+
[#1179]: https://github.com/stephencelis/SQLite.swift/pull/1179
225+
[#1178]: https://github.com/stephencelis/SQLite.swift/pull/1178
226+
[#1182]: https://github.com/stephencelis/SQLite.swift/pull/1182
227+
[#1192]: https://github.com/stephencelis/SQLite.swift/pull/1192
228+
[#1196]: https://github.com/stephencelis/SQLite.swift/pull/1196
229+
[#1200]: https://github.com/stephencelis/SQLite.swift/pull/1200
230+
[#1206]: https://github.com/stephencelis/SQLite.swift/pull/1206
231+
[#1217]: https://github.com/stephencelis/SQLite.swift/pull/1217
232+
[#1224]: https://github.com/stephencelis/SQLite.swift/pull/1224
233+
[#1242]: https://github.com/stephencelis/SQLite.swift/pull/1242
234+
[#1228]: https://github.com/stephencelis/SQLite.swift/pull/1228
235+
[#1218]: https://github.com/stephencelis/SQLite.swift/pull/1218
236+
[#1210]: https://github.com/stephencelis/SQLite.swift/pull/1210
237+
[#1245]: https://github.com/stephencelis/SQLite.swift/pull/1245

Documentation/Index.md

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
# SQLite.swift Documentation
22

3+
- [SQLite.swift Documentation](#sqliteswift-documentation)
34
- [Installation](#installation)
45
- [Swift Package Manager](#swift-package-manager)
56
- [Carthage](#carthage)
67
- [CocoaPods](#cocoapods)
8+
- [Requiring a specific version of SQLite](#requiring-a-specific-version-of-sqlite)
9+
- [Using SQLite.swift with SQLCipher](#using-sqliteswift-with-sqlcipher)
710
- [Manual](#manual)
811
- [Getting Started](#getting-started)
912
- [Connecting to a Database](#connecting-to-a-database)
1013
- [Read-Write Databases](#read-write-databases)
1114
- [Read-Only Databases](#read-only-databases)
12-
- [In a Shared Group Container](#in-a-shared-group-container)
15+
- [In a shared group container](#in-a-shared-group-container)
1316
- [In-Memory Databases](#in-memory-databases)
1417
- [URI parameters](#uri-parameters)
1518
- [Thread-Safety](#thread-safety)
1619
- [Building Type-Safe SQL](#building-type-safe-sql)
1720
- [Expressions](#expressions)
18-
- [Compound Expressions](#compound-expressions)
21+
- [Compound Expressions](#compound-expressions)
1922
- [Queries](#queries)
2023
- [Creating a Table](#creating-a-table)
2124
- [Create Table Options](#create-table-options)
@@ -24,8 +27,11 @@
2427
- [Inserting Rows](#inserting-rows)
2528
- [Handling SQLite errors](#handling-sqlite-errors)
2629
- [Setters](#setters)
30+
- [Infix Setters](#infix-setters)
31+
- [Postfix Setters](#postfix-setters)
2732
- [Selecting Rows](#selecting-rows)
2833
- [Iterating and Accessing Values](#iterating-and-accessing-values)
34+
- [Failable iteration](#failable-iteration)
2935
- [Plucking Rows](#plucking-rows)
3036
- [Building Complex Queries](#building-complex-queries)
3137
- [Selecting Columns](#selecting-columns)
@@ -34,6 +40,9 @@
3440
- [Table Aliasing](#table-aliasing)
3541
- [Filtering Rows](#filtering-rows)
3642
- [Filter Operators and Functions](#filter-operators-and-functions)
43+
- [Infix Filter Operators](#infix-filter-operators)
44+
- [Prefix Filter Operators](#prefix-filter-operators)
45+
- [Filtering Functions](#filtering-functions)
3746
- [Sorting Rows](#sorting-rows)
3847
- [Limiting and Paging Results](#limiting-and-paging-results)
3948
- [Recursive and Hierarchical Queries](#recursive-and-hierarchical-queries)
@@ -43,13 +52,14 @@
4352
- [Deleting Rows](#deleting-rows)
4453
- [Transactions and Savepoints](#transactions-and-savepoints)
4554
- [Querying the Schema](#querying-the-schema)
55+
- [Indexes and Columns](#indexes-and-columns)
4656
- [Altering the Schema](#altering-the-schema)
4757
- [Renaming Tables](#renaming-tables)
4858
- [Dropping Tables](#dropping-tables)
4959
- [Adding Columns](#adding-columns)
5060
- [Added Column Constraints](#added-column-constraints)
51-
- [Schema Changer](#schemachanger)
52-
- [Adding Columns](#adding-columns)
61+
- [SchemaChanger](#schemachanger)
62+
- [Adding Columns](#adding-columns-1)
5363
- [Renaming Columns](#renaming-columns)
5464
- [Dropping Columns](#dropping-columns)
5565
- [Renaming/Dropping Tables](#renamingdropping-tables)
@@ -61,17 +71,27 @@
6171
- [Date-Time Values](#date-time-values)
6272
- [Binary Data](#binary-data)
6373
- [Codable Types](#codable-types)
74+
- [Inserting Codable Types](#inserting-codable-types)
75+
- [Updating Codable Types](#updating-codable-types)
76+
- [Retrieving Codable Types](#retrieving-codable-types)
77+
- [Restrictions](#restrictions)
6478
- [Other Operators](#other-operators)
79+
- [Other Infix Operators](#other-infix-operators)
80+
- [Other Prefix Operators](#other-prefix-operators)
6581
- [Core SQLite Functions](#core-sqlite-functions)
6682
- [Aggregate SQLite Functions](#aggregate-sqlite-functions)
6783
- [Window SQLite Functions](#window-sqlite-functions)
68-
- [Date and Time Functions](#date-and-time-functions)
84+
- [Date and Time functions](#date-and-time-functions)
6985
- [Custom SQL Functions](#custom-sql-functions)
86+
- [Custom Aggregations](#custom-aggregations)
7087
- [Custom Collations](#custom-collations)
7188
- [Full-text Search](#full-text-search)
89+
- [FTS5](#fts5)
7290
- [Executing Arbitrary SQL](#executing-arbitrary-sql)
91+
- [Online Database Backup](#online-database-backup)
7392
- [Attaching and detaching databases](#attaching-and-detaching-databases)
7493
- [Logging](#logging)
94+
- [Vacuum](#vacuum)
7595

7696
[]: #sqliteswift-documentation
7797

@@ -88,7 +108,7 @@ process of downloading, compiling, and linking dependencies.
88108

89109
```swift
90110
dependencies: [
91-
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.14.1")
111+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.0")
92112
]
93113
```
94114

@@ -109,7 +129,7 @@ install SQLite.swift with Carthage:
109129
2. Update your Cartfile to include the following:
110130

111131
```ruby
112-
github "stephencelis/SQLite.swift" ~> 0.14.1
132+
github "stephencelis/SQLite.swift" ~> 0.15.0
113133
```
114134

115135
3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
@@ -139,7 +159,7 @@ install SQLite.swift with Carthage:
139159
use_frameworks!
140160
141161
target 'YourAppTargetName' do
142-
pod 'SQLite.swift', '~> 0.14.1'
162+
pod 'SQLite.swift', '~> 0.15.0'
143163
end
144164
```
145165

@@ -153,7 +173,7 @@ with the OS you can require the `standalone` subspec:
153173

154174
```ruby
155175
target 'YourAppTargetName' do
156-
pod 'SQLite.swift/standalone', '~> 0.14.1'
176+
pod 'SQLite.swift/standalone', '~> 0.15.0'
157177
end
158178
```
159179

@@ -163,7 +183,7 @@ dependency to sqlite3 or one of its subspecs:
163183

164184
```ruby
165185
target 'YourAppTargetName' do
166-
pod 'SQLite.swift/standalone', '~> 0.14.1'
186+
pod 'SQLite.swift/standalone', '~> 0.15.0'
167187
pod 'sqlite3/fts5', '= 3.15.0' # SQLite 3.15.0 with FTS5 enabled
168188
end
169189
```
@@ -179,7 +199,7 @@ If you want to use [SQLCipher][] with SQLite.swift you can require the
179199
target 'YourAppTargetName' do
180200
# Make sure you only require the subspec, otherwise you app might link against
181201
# the system SQLite, which means the SQLCipher-specific methods won't work.
182-
pod 'SQLite.swift/SQLCipher', '~> 0.14.1'
202+
pod 'SQLite.swift/SQLCipher', '~> 0.15.0'
183203
end
184204
```
185205

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gem 'cocoapods', :git => 'https://github.com/SagarSDagdu/CocoaPods.git', tag: '1.15.2.1-sagard'

Gemfile.lock

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
GIT
2+
remote: https://github.com/SagarSDagdu/CocoaPods.git
3+
revision: d96f491f79abd2804d1359c5228cce404dd365b7
4+
tag: 1.15.2.1-sagard
5+
specs:
6+
cocoapods (1.15.2.1.pre.sagard)
7+
addressable (~> 2.8)
8+
claide (>= 1.0.2, < 2.0)
9+
cocoapods-core (= 1.15.2)
10+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
11+
cocoapods-downloader (>= 2.1, < 3.0)
12+
cocoapods-plugins (>= 1.0.0, < 2.0)
13+
cocoapods-search (>= 1.0.0, < 2.0)
14+
cocoapods-trunk (>= 1.6.0, < 2.0)
15+
cocoapods-try (>= 1.1.0, < 2.0)
16+
colored2 (~> 3.1)
17+
escape (~> 0.0.4)
18+
fourflusher (>= 2.3.0, < 3.0)
19+
gh_inspector (~> 1.0)
20+
molinillo (~> 0.8.0)
21+
nap (~> 1.0)
22+
ruby-macho (>= 2.3.0, < 3.0)
23+
xcodeproj (>= 1.23.0, < 2.0)
24+
25+
GEM
26+
specs:
27+
CFPropertyList (3.0.7)
28+
base64
29+
nkf
30+
rexml
31+
activesupport (7.1.3.2)
32+
base64
33+
bigdecimal
34+
concurrent-ruby (~> 1.0, >= 1.0.2)
35+
connection_pool (>= 2.2.5)
36+
drb
37+
i18n (>= 1.6, < 2)
38+
minitest (>= 5.1)
39+
mutex_m
40+
tzinfo (~> 2.0)
41+
addressable (2.8.6)
42+
public_suffix (>= 2.0.2, < 6.0)
43+
algoliasearch (1.27.5)
44+
httpclient (~> 2.8, >= 2.8.3)
45+
json (>= 1.5.1)
46+
atomos (0.1.3)
47+
base64 (0.2.0)
48+
bigdecimal (3.1.5)
49+
claide (1.1.0)
50+
cocoapods-core (1.15.2)
51+
activesupport (>= 5.0, < 8)
52+
addressable (~> 2.8)
53+
algoliasearch (~> 1.0)
54+
concurrent-ruby (~> 1.1)
55+
fuzzy_match (~> 2.0.4)
56+
nap (~> 1.0)
57+
netrc (~> 0.11)
58+
public_suffix (~> 4.0)
59+
typhoeus (~> 1.0)
60+
cocoapods-deintegrate (1.0.5)
61+
cocoapods-downloader (2.1)
62+
cocoapods-plugins (1.0.0)
63+
nap
64+
cocoapods-search (1.0.1)
65+
cocoapods-trunk (1.6.0)
66+
nap (>= 0.8, < 2.0)
67+
netrc (~> 0.11)
68+
cocoapods-try (1.2.0)
69+
colored2 (3.1.2)
70+
concurrent-ruby (1.2.3)
71+
connection_pool (2.4.1)
72+
drb (2.2.0)
73+
ruby2_keywords
74+
escape (0.0.4)
75+
ethon (0.16.0)
76+
ffi (>= 1.15.0)
77+
ffi (1.16.3)
78+
fourflusher (2.3.1)
79+
fuzzy_match (2.0.4)
80+
gh_inspector (1.1.3)
81+
httpclient (2.8.3)
82+
i18n (1.14.4)
83+
concurrent-ruby (~> 1.0)
84+
json (2.7.1)
85+
minitest (5.22.0)
86+
molinillo (0.8.0)
87+
mutex_m (0.2.0)
88+
nanaimo (0.3.0)
89+
nap (1.1.0)
90+
netrc (0.11.0)
91+
nkf (0.1.3)
92+
public_suffix (4.0.7)
93+
rexml (3.2.6)
94+
ruby-macho (2.5.1)
95+
ruby2_keywords (0.0.5)
96+
typhoeus (1.4.1)
97+
ethon (>= 0.9.0)
98+
tzinfo (2.0.6)
99+
concurrent-ruby (~> 1.0)
100+
xcodeproj (1.24.0)
101+
CFPropertyList (>= 2.3.3, < 4.0)
102+
atomos (~> 0.1.3)
103+
claide (>= 1.0.2, < 2.0)
104+
colored2 (~> 3.1)
105+
nanaimo (~> 0.3.0)
106+
rexml (~> 3.2.4)
107+
108+
PLATFORMS
109+
arm64-darwin-23
110+
ruby
111+
112+
DEPENDENCIES
113+
cocoapods!
114+
115+
BUNDLED WITH
116+
2.5.4

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Swift code.
128128

129129
```swift
130130
dependencies: [
131-
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.14.1")
131+
.package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.0")
132132
]
133133
```
134134

@@ -152,7 +152,7 @@ install SQLite.swift with Carthage:
152152
2. Update your Cartfile to include the following:
153153

154154
```ruby
155-
github "stephencelis/SQLite.swift" ~> 0.14.1
155+
github "stephencelis/SQLite.swift" ~> 0.15.0
156156
```
157157

158158
3. Run `carthage update` and

SQLite.swift.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "SQLite.swift"
3-
s.version = "0.14.1"
3+
s.version = "0.15.0"
44
s.summary = "A type-safe, Swift-language layer over SQLite3."
55

66
s.description = <<-DESC
@@ -18,10 +18,10 @@ Pod::Spec.new do |s|
1818
s.default_subspec = 'standard'
1919
s.swift_versions = ['5']
2020

21-
ios_deployment_target = '17.0'
22-
tvos_deployment_target = '17.0'
23-
osx_deployment_target = '14.0'
24-
watchos_deployment_target = '10.0'
21+
ios_deployment_target = '12.0'
22+
tvos_deployment_target = '12.0'
23+
osx_deployment_target = '10.13'
24+
watchos_deployment_target = '4.0'
2525

2626
s.ios.deployment_target = ios_deployment_target
2727
s.tvos.deployment_target = tvos_deployment_target

0 commit comments

Comments
 (0)