Merge branch 'development'

Author: groue

.github/workflows/CI.yml

@@ -32,29 +32,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_13.3.1.app"
+          - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_13.2.1.app"
-            runsOn: macOS-11
-            name: "macOS 11, Xcode 13.2.1, Swift 5.5.2"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_13.1.app"
-            runsOn: macOS-11
-            name: "macOS 11, Xcode 13.1, Swift 5.5.1"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_13.0.app"
-            runsOn: macOS-11
-            name: "macOS 11, Xcode 13.0, Swift 5.5.0"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_12.5.1.app"
-            runsOn: macOS-11
-            name: "macOS 11, Xcode 12.5.1, Swift 5.4"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_12.4.app"
-            runsOn: macOS-10.15
-            name: "macOS 10.15, Xcode 12.4, Swift 5.3"
+            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
             shell: "/bin/zsh {0}"
     steps:
       - uses: actions/checkout@v3
@@ -68,13 +48,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_13.3.1.app"
+          - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_12.4.app"
-            runsOn: macOS-10.15
-            name: "macOS 10.15, Xcode 12.4, Swift 5.3"
+            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
             shell: "/bin/zsh {0}"
     steps:
       - uses: actions/checkout@v3
@@ -88,9 +64,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_13.3.1.app"
+          - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
+            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
             shell: "/bin/zsh {0}"
     steps:
       - uses: actions/checkout@v3
@@ -104,9 +80,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_13.3.1.app"
+          - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
+            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
             shell: "/bin/zsh {0}"
     steps:
       - uses: actions/checkout@v3
@@ -120,13 +96,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_13.3.1.app"
+          - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_12.4.app"
-            runsOn: macOS-10.15
-            name: "macOS 10.15, Xcode 12.4, Swift 5.3"
+            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
             shell: "/bin/zsh {0}"
     steps:
       - uses: actions/checkout@v3
@@ -140,13 +112,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_13.3.1.app"
+          - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
-            shell: "/bin/zsh {0}"
-          - xcode: "Xcode_12.4.app"
-            runsOn: macOS-10.15
-            name: "macOS 10.15, Xcode 12.4, Swift 5.3"
+            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
             shell: "/bin/zsh {0}"
     steps:
       - uses: actions/checkout@v3
@@ -160,9 +128,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_13.3.1.app"
+          - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 13.3.1, Swift 5.6"
+            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
             shell: "/bin/zsh {0}"
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 6.x Releases
 
+- `6.2.x` Releases - [6.2.0](#620)
 - `6.1.x` Releases - [6.1.0](#610)
 - `6.0.x` Releases - [6.0.0](#600)
 - `6.0.0` Betas - [6.0.0-beta](#600-beta) | [6.0.0-beta.2](#600-beta2) | [6.0.0-beta.3](#600-beta3) | [6.0.0-beta.4](#600-beta4)
@@ -99,6 +100,13 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 6.2.0
+
+Released October 28, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.1.0...v6.2.0)
+
+- **New**: [#1289](https://github.com/groue/GRDB.swift/pull/1289) by [@arkie](https://github.com/arkie): Add support for passing in categories to the FTS5 unicode61 tokenizer (SQLite 3.25+)
+- **Fixed**: The `FTS5Tokenizer.tokenize(query:)` method no longer returns incorrect results for certain tokenizer arguments.
+
 ## 6.1.0
 
 Released October 20, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.0.0...v6.1.0)

Documentation/FullTextSearch.md

@@ -304,7 +304,7 @@ let pattern = FTS3Pattern(matchingAnyTokenIn: "")  // nil
 let pattern = FTS3Pattern(matchingAnyTokenIn: "*") // nil
 ```
 
-FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.1/Structs/StatementArguments.html):
+FTS3Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.2/Structs/StatementArguments.html):
 
 ```swift
 let documents = try Document.fetchAll(db,
@@ -587,7 +587,7 @@ let pattern = FTS5Pattern(matchingAnyTokenIn: "")  // nil
 let pattern = FTS5Pattern(matchingAnyTokenIn: "*") // nil
 ```
 
-FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.1/Structs/StatementArguments.html):
+FTS5Pattern are regular [values](../README.md#values). You can use them as query [arguments](http://groue.github.io/GRDB.swift/docs/6.2/Structs/StatementArguments.html):
 
 ```swift
 let documents = try Document.fetchAll(db,

Documentation/Migrations.md

@@ -77,7 +77,7 @@ try dbQueue.read { db in
 }
 ```
 
-See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/6.1/Structs/DatabaseMigrator.html) for more migrator methods.
+See the [DatabaseMigrator reference](http://groue.github.io/GRDB.swift/docs/6.2/Structs/DatabaseMigrator.html) for more migrator methods.
 
 
 ## The `eraseDatabaseOnSchemaChange` Option

GRDB.swift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'GRDB.swift'
-  s.version  = '6.1.0'
+  s.version  = '6.2.0'
 
   s.license  = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'A toolkit for SQLite databases, with a focus on application development.'

GRDB/Core/Row.swift

@@ -198,7 +198,7 @@ extension Row {
     /// Returns true if the row contains null at given index.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// This method is equivalent to `row[index] == nil`, but may be preferred
     /// in performance-critical code because it can avoid decoding database
@@ -212,7 +212,7 @@ extension Row {
     /// stored at the given index.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     public subscript(_ index: Int) -> (any DatabaseValueConvertible)? {
         _checkIndex(index)
         return impl.databaseValue(atUncheckedIndex: index).storage.value
@@ -221,7 +221,7 @@ extension Row {
     /// Returns the value at given index, converted to the requested type.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// For example:
     ///
@@ -243,7 +243,7 @@ extension Row {
     /// Returns the value at given index, converted to the requested type.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// This method exists as an optimization opportunity for types that adopt
     /// ``StatementColumnConvertible``. It can trigger SQLite built-in
@@ -421,7 +421,7 @@ extension Row {
     /// Returns the optional `Data` at given index.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// If the SQLite value is NULL, the result is nil. If the SQLite value can
     /// not be converted to Data, a fatal error is raised.
@@ -679,7 +679,7 @@ extension Row {
     /// Returns the value at given index, converted to the requested type.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// If the SQLite value is NULL, or if the conversion fails, a
     /// `RowDecodingError` is thrown.
@@ -724,7 +724,7 @@ extension Row {
     /// Returns the value at given index, converted to the requested type.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// If the SQLite value is NULL, or if the conversion fails, a
     /// `RowDecodingError` is thrown.
@@ -788,7 +788,7 @@ extension Row {
     /// Returns the optional Data at given index.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// If the SQLite value is NULL, the result is nil. If the SQLite value can
     /// not be converted to Data, a `RowDecodingError` is thrown.
@@ -803,7 +803,7 @@ extension Row {
     /// Returns the Data at given index.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// If the SQLite value is NULL, or if the SQLite value can not be converted
     /// to Data, a `RowDecodingError` is thrown.

GRDB/Core/TransactionObserver.swift

@@ -21,7 +21,7 @@ extension Database {
         // Drop cached statements that delete, because the addition of an
         // observer may change the need for truncate optimization prevention.
         publicStatementCache.removeAll { $0.isDeleteStatement }
-        internalStatementCache.removeAll{ $0.isDeleteStatement }
+        internalStatementCache.removeAll { $0.isDeleteStatement }
 
         observationBroker.add(transactionObserver: transactionObserver, extent: extent)
     }
@@ -1158,7 +1158,7 @@ public struct DatabasePreUpdateEvent {
     /// Returns the initial `DatabaseValue` at given index.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// The result is nil if the event is an .Insert event.
     public func initialDatabaseValue(atIndex index: Int) -> DatabaseValue? {
@@ -1180,7 +1180,7 @@ public struct DatabasePreUpdateEvent {
     /// Returns the final `DatabaseValue` at given index.
     ///
     /// Indexes span from 0 for the leftmost column to (row.count - 1) for the
-    /// righmost column.
+    /// rightmost column.
     ///
     /// The result is nil if the event is a .Delete event.
     public func finalDatabaseValue(atIndex index: Int) -> DatabaseValue? {

GRDB/FTS/FTS5.swift

@@ -103,6 +103,9 @@ public struct FTS5: VirtualTableModule {
         if let tokenizer = definition.tokenizer {
             let tokenizerSQL = try tokenizer
                 .components
+                .map { component in
+                    try component.sqlExpression.quotedSQL(db)
+                }
                 .joined(separator: " ")
                 .sqlExpression
                 .quotedSQL(db)