Merge branch 'master' into deploymentTarget9

Author: nathanfallet

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

@@ -0,0 +1,60 @@
+name: Build and test
+on: [push, pull_request]
+env:
+  IOS_SIMULATOR: iPhone 12
+  IOS_VERSION: 14.4
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install
+      run: |
+        gem update bundler
+        gem install xcpretty --no-document
+        brew update
+        brew outdated carthage || brew upgrade carthage
+    - name: "Run tests (BUILD_SCHEME: SQLite iOS)"
+      env:
+        BUILD_SCHEME: SQLite iOS
+      run: ./run-tests.sh
+    - name: "Run tests (BUILD_SCHEME: SQLite Mac)"
+      env:
+        BUILD_SCHEME: SQLite Mac
+      run: ./run-tests.sh
+    - name: "Run tests (VALIDATOR_SUBSPEC: none)"
+      env:
+        VALIDATOR_SUBSPEC: none
+      run: ./run-tests.sh
+    - name: "Run tests (VALIDATOR_SUBSPEC: standard)"
+      env:
+        VALIDATOR_SUBSPEC: standard
+      run: ./run-tests.sh
+    - name: "Run tests (VALIDATOR_SUBSPEC: standalone)"
+      env:
+        VALIDATOR_SUBSPEC: standalone
+      run: ./run-tests.sh
+    - name: "Run tests (VALIDATOR_SUBSPEC: SQLCipher)"
+      env:
+        VALIDATOR_SUBSPEC: SQLCipher
+      run: ./run-tests.sh
+    - name: "Run tests (CARTHAGE_PLATFORM: iOS)"
+      env:
+        CARTHAGE_PLATFORM: iOS
+      run: ./run-tests.sh
+    - name: "Run tests (CARTHAGE_PLATFORM: Mac)"
+      env:
+        CARTHAGE_PLATFORM: Mac
+      run: ./run-tests.sh
+    - name: "Run tests (CARTHAGE_PLATFORM: watchOS)"
+      env:
+        CARTHAGE_PLATFORM: watchOS
+      run: ./run-tests.sh
+    - name: "Run tests (CARTHAGE_PLATFORM: tvOS)"
+      env:
+        CARTHAGE_PLATFORM: tvOS
+      run: ./run-tests.sh
+    - name: "Run tests (PACKAGE_MANAGER_COMMAND: test)"
+      env:
+        PACKAGE_MANAGER_COMMAND: test
+      run: ./run-tests.sh

.github/workflows/build.yml

@@ -1,3 +1,11 @@
+0.12.3 (18-05-2021), [diff][diff-0.12.2]
+========================================
+
+* Swift 5.3 support.
+* Xcode 12.5 support.
+* Bumps minimum deployment versions.
+* Fixes up Package.swift to build SQLiteObjc module.
+
 0.11.6 (xxx), [diff][diff-0.11.6]
 ========================================
 

.travis.yml

@@ -35,6 +35,7 @@
       - [Sorting Rows](#sorting-rows)
       - [Limiting and Paging Results](#limiting-and-paging-results)
       - [Aggregation](#aggregation)
+  - [Upserting Rows](#upserting-rows)
   - [Updating Rows](#updating-rows)
   - [Deleting Rows](#deleting-rows)
   - [Transactions and Savepoints](#transactions-and-savepoints)
@@ -266,8 +267,8 @@ var path = NSSearchPathForDirectoriesInDomains(
 ).first! + "/" + Bundle.main.bundleIdentifier!
 
 // create parent directory iff it doesn’t exist
-try FileManager.default.createDirectoryAtPath(
-    path, withIntermediateDirectories: true, attributes: nil
+try FileManager.default.createDirectory(
+atPath: path, withIntermediateDirectories: true, attributes: nil
 )
 
 let db = try Connection("\(path)/db.sqlite3")
@@ -955,8 +956,10 @@ equate or compare different types will prevent compilation.
 | `~=`  | `(Interval, Comparable) -> Bool` | `BETWEEN`      |
 | `&&`  | `Bool -> Bool`                   | `AND`          |
 | `\|\|`| `Bool -> Bool`                   | `OR`           |
+| `===` | `Equatable -> Bool`              | `IS`           |
+| `!==` | `Equatable -> Bool`              | `IS NOT`       |
 
-> *When comparing against `nil`, SQLite.swift will use `IS` and `IS NOT`
+> * When comparing against `nil`, SQLite.swift will use `IS` and `IS NOT`
 > accordingly.
 
 
@@ -1098,6 +1101,33 @@ let count = try db.scalar(users.filter(name != nil).count)
 > // SELECT count(DISTINCT "name") FROM "users"
 > ```
 
+## Upserting Rows
+
+We can upsert rows into a table by calling a [query’s](#queries) `upsert`
+function with a list of [setters](#setters)—typically [typed column
+expressions](#expressions) and values (which can also be expressions)—each
+joined by the `<-` operator. Upserting is like inserting, except if there is a 
+conflict on the specified column value, SQLite will perform an update on the row instead.
+
+```swift
+try db.run(users.upsert(email <- "alice@mac.com", name <- "Alice"), onConflictOf: email)
+// INSERT INTO "users" ("email", "name") VALUES ('alice@mac.com', 'Alice') ON CONFLICT (\"email\") DO UPDATE SET \"name\" = \"excluded\".\"name\"
+```
+
+The `upsert` function, when run successfully, returns an `Int64` representing
+the inserted row’s [`ROWID`][ROWID].
+
+```swift
+do {
+    let rowid = try db.run(users.upsert(email <- "alice@mac.com", name <- "Alice", onConflictOf: email))
+    print("inserted id: \(rowid)")
+} catch {
+    print("insertion failed: \(error)")
+}
+```
+
+The [`insert`](#inserting-rows), [`update`](#updating-rows), and [`delete`](#deleting-rows) functions
+follow similar patterns.
 
 ## Updating Rows
 
@@ -1557,7 +1587,7 @@ Both of the above methods also have the following optional parameter:
 There are a few restrictions on using Codable types:
 
 - The encodable and decodable objects can only use the following types:
-    - Int, Bool, Float, Double, String
+    - Int, Bool, Float, Double, String, Date
     - Nested Codable types that will be encoded as JSON to a single column
 - These methods will not handle object relationships for you. You must write
   your own Codable and Decodable implementations if you wish to support this.
@@ -1792,12 +1822,12 @@ let config = FTS5Config()
     .column(subject)
     .column(body, [.unindexed])
 
-try db.run(emails.create(.FTS5(config))
+try db.run(emails.create(.FTS5(config)))
 // CREATE VIRTUAL TABLE "emails" USING fts5("subject", "body" UNINDEXED)
 
 // Note that FTS5 uses a different syntax to select columns, so we need to rewrite
 // the last FTS4 query above as:
-let replies = emails.filter(emails.match("subject:\"Re:\"*))
+let replies = emails.filter(emails.match("subject:\"Re:\"*"))
 // SELECT * FROM "emails" WHERE "emails" MATCH 'subject:"Re:"*'
 
 // https://www.sqlite.org/fts5.html#_changes_to_select_statements_

CHANGELOG.md

@@ -1,7 +1,7 @@
 BUILD_TOOL = xcodebuild
 BUILD_SCHEME = SQLite Mac
 IOS_SIMULATOR = iPhone XS
-IOS_VERSION = 12.2
+IOS_VERSION = 12.4
 ifeq ($(BUILD_SCHEME),SQLite iOS)
 	BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
 else

Documentation/Index.md

@@ -1,15 +1,46 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.3
 import PackageDescription
 
 let package = Package(
     name: "SQLite.swift",
-    products: [.library(name: "SQLite", targets: ["SQLite"])],
+    products: [
+			.library(
+				name: "SQLite", 
+				targets: ["SQLite"]
+			)
+		],
     targets: [
-        .target(name: "SQLite", dependencies: ["SQLiteObjc"]),
-        .target(name: "SQLiteObjc"),
-        .testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests")
-    ],
-    swiftLanguageVersions: [4, 5]
+        .target(
+					name: "SQLite", 
+					dependencies: ["SQLiteObjc"],
+					exclude: [
+						"Info.plist"
+					]
+				),
+        .target(
+					name: "SQLiteObjc",
+					dependencies: [],
+					exclude: [
+						"SQLiteObjc.h",
+						"fts3_tokenizer.h",
+						"include/README.md"
+					]
+				),
+        .testTarget(
+					name: "SQLiteTests", 
+					dependencies: [
+						"SQLite"
+					], 
+					path: "Tests/SQLiteTests",
+					exclude: [
+						"Info.plist"
+					],
+					resources: [
+						.copy("fixtures/encrypted-3.x.sqlite"),
+						.copy("fixtures/encrypted-4.x.sqlite")
+					]
+				)
+    ]
 )
 
 #if os(Linux)