Merge branch 'groue:master' into sqlcipher

Author: marcprux

.github/workflows/CI.yml

@@ -46,7 +46,7 @@ jobs:
             name: "macOS"
           - xcode: "Xcode_16.1.app"
             runsOn: macOS-14
-            destination: "OS=18.1,name=iPhone 15 Pro"
+            destination: "OS=18.1,name=iPhone 16 Pro"
             name: "iOS"
           - xcode: "Xcode_16.1.app"
             runsOn: macOS-14

CHANGELOG.md

@@ -7,6 +7,8 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 7.x Releases
 
+- `7.3.x` Releases - [7.3.0](#730)
+- `7.2.x` Releases - [7.2.0](#720)
 - `7.1.x` Releases - [7.1.0](#710)
 - `7.0.x` Releases - [7.0.0](#700)
 - `7.0.0` Betas - [7.0.0-beta](#700-beta) - [7.0.0-beta.2](#700-beta2) - [7.0.0-beta.3](#700-beta3) - [7.0.0-beta.4](#700-beta4) - [7.0.0-beta.5](#700-beta5) - [7.0.0-beta.6](#700-beta6) - [7.0.0-beta.7](#700-beta7)
@@ -133,6 +135,19 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 7.3.0
+
+Released February 23, 2025
+
+- **New**: Support for temporary virtual tables by [@groue](https://github.com/groue) in [#1731](https://github.com/groue/GRDB.swift/pull/1731)
+- Fixed a compiler error in Xcode 16.3 beta ([#1729](https://github.com/groue/GRDB.swift/pull/1729), [#1730](https://github.com/groue/GRDB.swift/pull/1730))
+
+## 7.2.0
+
+Released February 12, 2025
+
+- **New**: Select ids with selectID() by [@groue](https://github.com/groue) in [#1719](https://github.com/groue/GRDB.swift/pull/1719)
+
 ## 7.1.0
 
 Released February 5, 2025

Documentation/FullTextSearch.md

@@ -91,7 +91,7 @@ Generally speaking, FTS5 is better than FTS4 which improves on FTS3. But this do
 
 **FTS3 and FTS4 full-text tables store and index textual content.**
 
-Create tables with the `create(virtualTable:using:)` method:
+Create tables with the `create(virtualTable:options:using:_:)` method:
 
 ```swift
 // CREATE VIRTUAL TABLE document USING fts3(content)
@@ -326,7 +326,7 @@ let documents = try Document.filter(Column("content").match(pattern)).fetchAll(d
 
 To use FTS5, you'll need a [custom SQLite build] that activates the `SQLITE_ENABLE_FTS5` compilation option.
 
-Create FTS5 tables with the `create(virtualTable:using:)` method:
+Create FTS5 tables with the `create(virtualTable:options:using:_:)` method:
 
 ```swift
 // CREATE VIRTUAL TABLE document USING fts5(content)

GRDB.swift.podspec

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

GRDB/Documentation.docc/DatabaseSchemaModifications.md

@@ -252,8 +252,8 @@ Unique constraints and unique indexes are somewhat different: don't miss the tip
 
 - ``Database/alter(table:body:)``
 - ``Database/create(table:options:body:)``
-- ``Database/create(virtualTable:ifNotExists:using:)``
-- ``Database/create(virtualTable:ifNotExists:using:_:)``
+- ``Database/create(virtualTable:options:using:)``
+- ``Database/create(virtualTable:options:using:_:)``
 - ``Database/drop(table:)``
 - ``Database/dropFTS4SynchronizationTriggers(forTable:)``
 - ``Database/dropFTS5SynchronizationTriggers(forTable:)``
@@ -265,6 +265,7 @@ Unique constraints and unique indexes are somewhat different: don't miss the tip
 - ``TableDefinition``
 - ``TableOptions``
 - ``VirtualTableModule``
+- ``VirtualTableOptions``
 
 ### Database Views
 
@@ -288,3 +289,5 @@ Those are legacy interfaces that are preserved for backwards compatibility. Thei
 
 - ``Database/create(index:on:columns:unique:ifNotExists:condition:)``
 - ``Database/create(table:temporary:ifNotExists:withoutRowID:body:)``
+- ``Database/create(virtualTable:ifNotExists:using:)``
+- ``Database/create(virtualTable:ifNotExists:using:_:)``

GRDB/Documentation.docc/RecordRecommendedPractices.md

@@ -393,16 +393,16 @@ Extensions to the `DerivableRequest` protocol can not change the type of request
 
 ```swift
 extension QueryInterfaceRequest<Author> {
-    // Selects author ids
-    func selectId() -> QueryInterfaceRequest<Int64> {
-        selectPrimaryKey(as: Int64.self)
+    // Selects authors' name
+    func selectName() -> QueryInterfaceRequest<String> {
+        select(Author.Columns.name)
     }
 }
 
-// The ids of Japanese authors
-let ids: Set<Int64> = try Author.all()
+// The names of Japanese authors
+let names: Set<String> = try Author.all()
     .filter(countryCode: "JP")
-    .selectId()
+    .selectName()
     .fetchSet(db)
 ```
 

GRDB/FTS/FTS3.swift

@@ -1,7 +1,7 @@
 /// The virtual table module for the FTS3 full-text engine.
 ///
 /// To create FTS3 tables, use the ``Database`` method
-/// ``Database/create(virtualTable:ifNotExists:using:_:)``:
+/// ``Database/create(virtualTable:options:using:_:)``:
 ///
 /// ```swift
 /// // CREATE VIRTUAL TABLE document USING fts3(content)
@@ -63,7 +63,7 @@ public struct FTS3 {
     /// }
     /// ```
     ///
-    /// See ``Database/create(virtualTable:ifNotExists:using:_:)``
+    /// See ``Database/create(virtualTable:options:using:_:)``
     public init() { }
 
     /// Returns an array of tokens found in the string argument.
@@ -143,7 +143,7 @@ extension FTS3: VirtualTableModule {
 /// virtual table.
 ///
 /// You don't create instances of this class. Instead, you use the `Database`
-/// ``Database/create(virtualTable:ifNotExists:using:_:)`` method:
+/// ``Database/create(virtualTable:options:using:_:)`` method:
 ///
 /// ```swift
 /// try db.create(virtualTable: "document", using: FTS3()) { t in // t is FTS3TableDefinition

GRDB/FTS/FTS3TokenizerDescriptor.swift

@@ -106,13 +106,13 @@ public struct FTS3TokenizerDescriptor: Sendable {
         if !separators.isEmpty {
             // TODO: test "=" and "\"", "(" and ")" as separators, with
             // both FTS3Pattern(matchingAnyTokenIn:tokenizer:)
-            // and Database.create(virtualTable:using:)
+            // and Database.create(virtualTable:options:using:_:)
             arguments.append("separators=" + separators.sorted().map { String($0) }.joined())
         }
         if !tokenCharacters.isEmpty {
             // TODO: test "=" and "\"", "(" and ")" as tokenCharacters, with
             // both FTS3Pattern(matchingAnyTokenIn:tokenizer:)
-            // and Database.create(virtualTable:using:)
+            // and Database.create(virtualTable:options:using:_:)
             arguments.append("tokenchars=" + tokenCharacters.sorted().map { String($0) }.joined())
         }
         return FTS3TokenizerDescriptor("unicode61", arguments: arguments)

GRDB/FTS/FTS4.swift

@@ -1,7 +1,7 @@
 /// The virtual table module for the FTS4 full-text engine.
 ///
 /// To create FTS4 tables, use the ``Database`` method
-/// ``Database/create(virtualTable:ifNotExists:using:_:)``:
+/// ``Database/create(virtualTable:options:using:_:)``:
 ///
 /// ```swift
 /// // CREATE VIRTUAL TABLE document USING fts4(content)
@@ -31,7 +31,7 @@ public struct FTS4 {
     /// }
     /// ```
     ///
-    /// See ``Database/create(virtualTable:ifNotExists:using:_:)``
+    /// See ``Database/create(virtualTable:options:using:_:)``
     public init() { }
 }
 
@@ -102,6 +102,16 @@ extension FTS4: VirtualTableModule {
         case .synchronized(let contentTable):
             // https://www.sqlite.org/fts3.html#_external_content_fts4_tables_
 
+            if definition.configuration.temporary {
+                // SQLite can't rebuild the index of temporary tables:
+                //
+                // sqlite> CREATE TABLE t(id INTEGER PRIMARY KEY, a, b, c);
+                // sqlite> CREATE VIRTUAL TABLE temp.ft USING fts4(content="t", b, c);
+                // sqlite> INSERT INTO ft(ft) VALUES('rebuild');
+                // Runtime error: SQL logic error
+                fatalError("Temporary external content FTS4 tables are not supported.")
+            }
+            
             let rowIDColumn = try db.primaryKey(contentTable).rowIDColumn ?? Column.rowID.name
             let ftsTable = tableName.quotedDatabaseIdentifier
             let content = contentTable.quotedDatabaseIdentifier
@@ -149,7 +159,7 @@ extension FTS4: VirtualTableModule {
 /// virtual table.
 ///
 /// You don't create instances of this class. Instead, you use the `Database`
-/// ``Database/create(virtualTable:ifNotExists:using:_:)`` method:
+/// ``Database/create(virtualTable:options:using:_:)`` method:
 ///
 /// ```swift
 /// try db.create(virtualTable: "document", using: FTS4()) { t in // t is FTS4TableDefinition

GRDB/FTS/FTS5.swift

@@ -13,7 +13,7 @@ import Foundation
 /// The virtual table module for the FTS5 full-text engine.
 ///
 /// To create FTS5 tables, use the ``Database`` method
-/// ``Database/create(virtualTable:ifNotExists:using:_:)``:
+/// ``Database/create(virtualTable:options:using:_:)``:
 ///
 /// ```swift
 /// // CREATE VIRTUAL TABLE document USING fts5(content)
@@ -85,7 +85,7 @@ public struct FTS5 {
     /// }
     /// ```
     ///
-    /// See ``Database/create(virtualTable:ifNotExists:using:_:)``
+    /// See ``Database/create(virtualTable:options:using:_:)``
     public init() { }
 
     // Support for FTS5Pattern initializers. Don't make public. Users tokenize
@@ -143,7 +143,7 @@ extension FTS5: VirtualTableModule {
 
     /// Reserved; part of the VirtualTableModule protocol.
     ///
-    /// See Database.create(virtualTable:using:)
+    /// See Database.create(virtualTable:options:using:_:)
     public func makeTableDefinition(configuration: VirtualTableConfiguration) -> FTS5TableDefinition {
         FTS5TableDefinition(configuration: configuration)
     }
@@ -219,14 +219,24 @@ extension FTS5: VirtualTableModule {
 
     /// Reserved; part of the VirtualTableModule protocol.
     ///
-    /// See Database.create(virtualTable:using:)
+    /// See Database.create(virtualTable:options:using:_:)
     public func database(_ db: Database, didCreate tableName: String, using definition: FTS5TableDefinition) throws {
         switch definition.contentMode {
         case .raw:
             break
         case .synchronized(let contentTable):
             // https://sqlite.org/fts5.html#external_content_tables
 
+            if definition.configuration.temporary {
+                // SQLite can't rebuild the index of temporary tables:
+                //
+                // sqlite> CREATE TABLE t(id INTEGER PRIMARY KEY, a, b, c);
+                // sqlite> CREATE VIRTUAL TABLE temp.ft USING fts5(content="t",content_rowid="a",b,c);
+                // sqlite> INSERT INTO ft(ft) VALUES('rebuild');
+                // Runtime error: SQL logic error
+                fatalError("Temporary external content FTS5 tables are not supported.")
+            }
+            
             let rowIDColumn = try db.primaryKey(contentTable).rowIDColumn ?? Column.rowID.name
             let ftsTable = tableName.quotedDatabaseIdentifier
             let content = contentTable.quotedDatabaseIdentifier
@@ -274,7 +284,7 @@ extension FTS5: VirtualTableModule {
 /// virtual table.
 ///
 /// You don't create instances of this class. Instead, you use the `Database`
-/// ``Database/create(virtualTable:ifNotExists:using:_:)`` method:
+/// ``Database/create(virtualTable:options:using:_:)`` method:
 ///
 /// ```swift
 /// try db.create(virtualTable: "document", using: FTS5()) { t in // t is FTS5TableDefinition