Merge branch 'development'

Author: groue

.github/workflows/CI.yml

@@ -50,7 +50,7 @@ jobs:
             name: "iOS"
           - xcode: "Xcode_16.1.app"
             runsOn: macOS-14
-            destination: "OS=18.0,name=Apple TV"
+            destination: "OS=18.1,name=Apple TV"
             name: "tvOS"
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -7,7 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 7.x Releases
 
-- `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` 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)
 
 #### 6.x Releases
 
@@ -131,6 +131,18 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 7.0.0-beta.7
+
+Released January 19, 2025
+
+- **New**: Select all columns from a table, but a few ones by [@groue](https://github.com/groue) in [#1700](https://github.com/groue/GRDB.swift/pull/1700)
+- **Fixed**: Fix typo in Readme.md by [@kevinlg](https://github.com/kevinlg) in [#1697](https://github.com/groue/GRDB.swift/pull/1697)
+- **New**: Bump custom SQLite to 3.47.2 by [@groue](https://github.com/groue) in [#1696](https://github.com/groue/GRDB.swift/pull/1696)
+- **Fixed**: Update LICENSE, fix copyright license year by [@JasonnnW3000](https://github.com/JasonnnW3000) in [#1695](https://github.com/groue/GRDB.swift/pull/1695)
+- **Fixed**: Core: import `ucrt` on Windows for `strcmp` by [@compnerd](https://github.com/compnerd) in [#1662](https://github.com/groue/GRDB.swift/pull/1662)
+- **Fixed**: Foundation: elide extensions on Windows to match Linux by [@compnerd](https://github.com/compnerd) in [#1661](https://github.com/groue/GRDB.swift/pull/1661)
+- **Fixed**: Docs: fixes typos "FST"->"FTS" by [@nylki](https://github.com/nylki) in [#1660](https://github.com/groue/GRDB.swift/pull/1660)
+
 ## 7.0.0-beta.6
 
 Released October 13, 2024
@@ -172,7 +184,7 @@ Released September 29, 2024
 
 [Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md) describes in detail how to bump the GRDB version in your application.
 
-The new [Swift Concurrency and GRDB](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/swiftconcurrency) guide explains how to best integrate GRDB and Swift Concurrency.
+The new [Swift Concurrency and GRDB](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.7/documentation/grdb/swiftconcurrency) guide explains how to best integrate GRDB and Swift Concurrency.
 
 The [demo app](Documentation/DemoApps/) was rewritten from scratch in a brand new Xcode 16 project.
 

Documentation/CustomSQLiteBuilds.md

@@ -3,7 +3,7 @@ Custom SQLite Builds
 
 By default, GRDB uses the version of SQLite that ships with the target operating system.
 
-**You can build GRDB with a custom build of [SQLite 3.46.1](https://www.sqlite.org/changes.html).**
+**You can build GRDB with a custom build of [SQLite 3.47.2](https://www.sqlite.org/changes.html).**
 
 A custom SQLite build can activate extra SQLite features, and extra GRDB features as well, such as support for the [FTS5 full-text search engine](../../../#full-text-search), and [SQLite Pre-Update Hooks](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/transactionobserver).
 

Documentation/FTS5Tokenizers.md

@@ -3,7 +3,7 @@ FTS5 Tokenizers
 
 **[FTS5](https://www.sqlite.org/fts5.html) is an extensible full-text search engine.**
 
-GRDB lets you define your own custom FST5 tokenizers, and extend SQLite built-in tokenizers. Possible use cases are:
+GRDB lets you define your own custom FTS5 tokenizers, and extend SQLite built-in tokenizers. Possible use cases are:
 
 - Have "fi" match the ligature "fi" (U+FB01)
 - Have "first" match "1st"
@@ -95,7 +95,7 @@ let documents = try Document.matching(pattern).fetchAll(db)
 
 ## FTS5Tokenizer
 
-**FST5Tokenizer** is the protocol for all FTS5 tokenizers.
+**FTS5Tokenizer** is the protocol for all FTS5 tokenizers.
 
 It only requires a tokenization method that matches the low-level `xTokenize` C function documented at https://www.sqlite.org/fts5.html#custom_tokenizers. We'll discuss it more when describing custom tokenizers.
 

Documentation/FullTextSearch.md

@@ -82,7 +82,7 @@ Generally speaking, FTS5 is better than FTS4 which improves on FTS3. But this do
 
 - **The location of the indexed text in your database schema.** Only FTS4 and FTS5 support "contentless" and "external content" tables.
 
-- See [FST3 vs. FTS4](https://www.sqlite.org/fts3.html#differences_between_fts3_and_fts4) and [FTS5 vs. FTS3/4](https://www.sqlite.org/fts5.html#appendix_a) for more differences.
+- See [FTS3 vs. FTS4](https://www.sqlite.org/fts3.html#differences_between_fts3_and_fts4) and [FTS5 vs. FTS3/4](https://www.sqlite.org/fts5.html#appendix_a) for more differences.
 
 > **Note**: In case you were still wondering, it is recommended to read the SQLite documentation: [FTS3 & FTS4](https://www.sqlite.org/fts3.html) and [FTS5](https://www.sqlite.org/fts5.html).
 

Documentation/GRDB7MigrationGuide.md

@@ -228,7 +228,7 @@ Do not miss [Swift Concurrency and GRDB], for more recommendations regarding non
 - The async sequence returned by [`ValueObservation.values`](https://swiftpackageindex.com/groue/grdb.swiftdocumentation/grdb/valueobservation/values(in:scheduling:bufferingpolicy:)) now iterates on the cooperative thread pool by default. Use .mainActor as the scheduler if you need the previous behavior.
 
 [Migrating to Swift 6]: https://www.swift.org/migration/documentation/migrationguide
-[Sharing a Database]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/databasesharing
-[Transaction Kinds]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/transactions#Transaction-Kinds
-[Swift Concurrency and GRDB]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/swiftconcurrency
-[Record]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/record
+[Sharing a Database]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.7/documentation/grdb/databasesharing
+[Transaction Kinds]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.7/documentation/grdb/transactions#Transaction-Kinds
+[Swift Concurrency and GRDB]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.7/documentation/grdb/swiftconcurrency
+[Record]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.7/documentation/grdb/record

Documentation/QueryInterfaceOrganization.md

@@ -497,15 +497,15 @@ protocol SQLSelectable {
 SQLSelectable feeds the `select()` method of the query interface:
 
 ```swift
-Player.select(AllColumns())
+Player.select(.allColumns)
 Player.select(Column("name"), Column("score"))
 ```
 
 All [SQLSpecificExpressible] values are selectable. Other selectable values are:
 
 ```swift
 // SELECT * FROM player
-Player.select(AllColumns())
+Player.select(.allColumns)
 
 // SELECT MAX(score) AS maxScore FROM player
 Player.select(max(Column("score")).forKey("maxScore"))

GRDB.swift.podspec

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

GRDB/Core/StatementAuthorizer.swift

@@ -13,6 +13,8 @@ import string_h
 import Glibc
 #elseif os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(visionOS)
 import Darwin
+#elseif os(Windows)
+import ucrt
 #endif
 
 /// `StatementAuthorizer` provides information about compiled database

GRDB/Core/Support/Foundation/NSNumber.swift

@@ -1,4 +1,4 @@
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 import Foundation
 
 private let integerRoundingBehavior = NSDecimalNumberHandler(

GRDB/Core/Support/Foundation/URL.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 /// NSURL stores its absoluteString in the database.
 extension NSURL: DatabaseValueConvertible {
 

GRDB/Core/Support/Foundation/UUID.swift

@@ -9,7 +9,7 @@ import SQLite3
 
 import Foundation
 
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 /// NSUUID adopts DatabaseValueConvertible
 extension NSUUID: DatabaseValueConvertible {
     /// Returns a BLOB database value containing the uuid bytes.

GRDB/Documentation.docc/DatabaseSchemaRecommendations.md

@@ -151,7 +151,7 @@ extension Player: FetchableRecord, MutablePersistableRecord {
     // Required because the primary key
     // is the hidden rowid column.
     static var databaseSelection: [any SQLSelectable] {
-        [AllColumns(), Column.rowID]
+        [.allColumns, .rowID]
     }
 
     // Update id upon successful insertion

GRDB/Documentation.docc/SwiftConcurrency.md

@@ -39,11 +39,73 @@ All safety guarantees of Swift 6 are enforced during database accesses. They are
 
 The following sections describe, with more details, how GRDB interacts with Swift Concurrency.
 
-- <doc:SwiftConcurrency#Non-Sendable-Record-Types>
 - <doc:SwiftConcurrency#Shorthand-Closure-Notation>
 - <doc:SwiftConcurrency#Non-Sendable-Configuration-of-Record-Types>
+- <doc:SwiftConcurrency#Non-Sendable-Record-Types>
 - <doc:SwiftConcurrency#Choosing-between-Synchronous-and-Asynchronous-Database-Accesses>
 
+### Shorthand Closure Notation
+
+In the Swift 5 language mode, the compiler emits a warning when a database access is written with the shorthand closure notation:
+
+```swift
+// Standard closure:
+let count = try await writer.read { db in
+    try Player.fetchCount(db)
+}
+
+// Shorthand notation:
+// ⚠️ Converting non-sendable function value to '@Sendable (Database) 
+// throws -> Int' may introduce data races.
+let count = try await writer.read(Player.fetchCount)
+```
+
+**You can remove this warning** by enabling [SE-0418: Inferring `Sendable` for methods and key path literals](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0418-inferring-sendable-for-methods.md), as below:
+
+- **Using Xcode**
+
+    Set `SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES` to `YES` in the build settings of your target.
+
+- **In a SwiftPM package manifest**
+
+    Enable the `InferSendableFromCaptures` upcoming feature: 
+    
+    ```swift
+    .target(
+        name: "MyTarget",
+        swiftSettings: [
+            .enableUpcomingFeature("InferSendableFromCaptures")
+        ]
+    )
+    ```
+
+This language feature is not enabled by default, because it can potentially [affect source compatibility](https://www.swift.org/migration/documentation/swift-6-concurrency-migration-guide/sourcecompatibility#Inferring-Sendable-for-methods-and-key-path-literals).
+
+### Non-Sendable Configuration of Record Types
+
+In the Swift 6 language mode, and in the Swift 5 language mode with strict concurrency checkings, the compiler emits an error or a warning when a record type specifies which columns it fetches from the database, with the ``TableRecord/databaseSelection-7iphs`` static property:
+
+```swift
+extension Player: FetchableRecord, PersistableRecord {
+    // ❌ Static property 'databaseSelection' is not concurrency-safe
+    // because non-'Sendable' type '[any SQLSelectable]'
+    // may have shared mutable state
+    static let databaseSelection: [any SQLSelectable] = [
+        Column("id"), Column("name"), Column("score")
+    ]
+}
+```
+
+**To fix this error**, replace the stored property with a computed property:
+
+```swift
+extension Player: FetchableRecord, PersistableRecord {
+    static var databaseSelection: [any SQLSelectable] {
+        [Column("id"), Column("name"), Column("score")]
+    }
+}
+```
+
 ### Non-Sendable Record Types
 
 In the Swift 6 language mode, and in the Swift 5 language mode with strict concurrency checkings, the compiler emits an error or a warning when the application reads, writes, or observes a non-[`Sendable`](https://developer.apple.com/documentation/swift/sendable) type.
@@ -128,97 +190,6 @@ You do not need to perform this refactoring right away: you can compile your app
 
     Yes. Classes that can not be modified, made of constant `let` properties, are Sendable. Those immutable classes will not make it easy to modify the database, though.
 
-#### FAQ: Why this Sendable requirement?
-
-**GRDB needs new features in the Swift language and the SDKs in order to deal with non-Sendable types.**
-
-[SE-0430: `sending` parameter and result values](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0430-transferring-parameters-and-results.md) looks like the language feature we need, but:
-
-- `DispatchQueue.async` does not accept a `sending` closure. GRDB needs this in order to accept non-Sendable records to be sent to the database, as below:
-
-    ```swift
-    let nonSendableRecord: Player
-    try await writer.write { db in
-        try nonSendableRecord.insert(db)
-    }
-    ```
-
-    Please [file a feedback](http://feedbackassistant.apple.com) for requesting this DispatchQueue improvement. The more the merrier. I personally filed FB15270949.
-
-- Database access methods taint the values they fetch. In the code below, the rules of [SE-0414: Region based Isolation](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0414-region-based-isolation.md) have the compiler refuse that the fetched player is sent back to the caller:
-
-    ```swift
-    let player = try await writer.read { db in
-        try Player.fetchOne(db, id: 42)
-    }
-    ```
-
-    Strictly speaking, the compiler diagnostic is correct: one could copy the non-Sendable `db` argument into the fetched `Player` instance, making it unsuitable for later use. In practice, nobody does that. Copying `db` is a programmer error, and GRDB promptly raises a fatal error whenever a `db` copy would be improperly used. But there is no way to tell the compiler about this practice.
-
-For all those reasons, GRDB has to require values that are asynchronously written and read from the database to be `Sendable`.
-
-### Shorthand Closure Notation
-
-In the Swift 5 language mode, the compiler emits a warning when a database access is written with the shorthand closure notation:
-
-```swift
-// Standard closure:
-let count = try await writer.read { db in
-    try Player.fetchCount(db)
-}
-
-// Shorthand notation:
-// ⚠️ Converting non-sendable function value to '@Sendable (Database) 
-// throws -> Int' may introduce data races.
-let count = try await writer.read(Player.fetchCount)
-```
-
-**You can remove this warning** by enabling [SE-0418: Inferring `Sendable` for methods and key path literals](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0418-inferring-sendable-for-methods.md), as below:
-
-- **Using Xcode**
-
-    Set `SWIFT_UPCOMING_FEATURE_INFER_SENDABLE_FROM_CAPTURES` to `YES` in the build settings of your target.
-
-- **In a SwiftPM package manifest**
-
-    Enable the `InferSendableFromCaptures` upcoming feature: 
-    
-    ```swift
-    .target(
-        name: "MyTarget",
-        swiftSettings: [
-            .enableUpcomingFeature("InferSendableFromCaptures")
-        ]
-    )
-    ```
-
-This language feature is not enabled by default, because it can potentially [affect source compatibility](https://www.swift.org/migration/documentation/swift-6-concurrency-migration-guide/sourcecompatibility#Inferring-Sendable-for-methods-and-key-path-literals).
-
-### Non-Sendable Configuration of Record Types
-
-In the Swift 6 language mode, and in the Swift 5 language mode with strict concurrency checkings, the compiler emits an error or a warning when a record type specifies which columns it fetches from the database, with the ``TableRecord/databaseSelection-7iphs`` static property:
-
-```swift
-extension Player: FetchableRecord, MutablePersistableRecord {
-    // ❌ Static property 'databaseSelection' is not concurrency-safe
-    // because non-'Sendable' type '[any SQLSelectable]'
-    // may have shared mutable state
-    static let databaseSelection: [any SQLSelectable] = [
-        Column("id"), Column("name"), Column("score")
-    ]
-}
-```
-
-**To fix this error**, replace the stored property with a computed property:
-
-```swift
-extension Player: FetchableRecord, MutablePersistableRecord {
-    static var databaseSelection: [any SQLSelectable] {
-        [Column("id"), Column("name"), Column("score")]
-    }
-}
-```
-
 ### Choosing between Synchronous and Asynchronous Database Accesses
 
 GRDB connections provide two versions of `read` and `write`, one that is synchronous, and one that is asynchronous. It might not be clear how to choose one or the other.

GRDB/QueryInterface/SQL/Column.swift

@@ -61,6 +61,13 @@ extension ColumnExpression {
 
 extension ColumnExpression where Self == Column {
     /// The hidden rowID column.
+    ///
+    /// For example:
+    ///
+    /// ```swift
+    /// // SELECT rowid FROM player
+    /// let rowids = try Player.select(.rowID).fetchSet(db)
+    /// ```
     public static var rowID: Self { Column.rowID }
 }
 

GRDB/QueryInterface/SQL/SQLExpression.swift

@@ -2136,7 +2136,14 @@ public protocol SQLExpressible {
 }
 
 extension SQLExpressible where Self == Column {
-    /// The hidden rowID column
+    /// The hidden rowID column.
+    ///
+    /// For example:
+    ///
+    /// ```swift
+    /// // SELECT rowid FROM player
+    /// let rowids = try Player.select(.rowID).fetchSet(db)
+    /// ```
     public static var rowID: Self { Column.rowID }
 }
 

GRDB/QueryInterface/SQL/SQLRelation.swift

@@ -636,7 +636,7 @@ extension SQLRelation {
             }
 
             // <https://github.com/groue/GRDB.swift/issues/1357>
-            guard selection.allSatisfy(\.isTriviallyCountable) else {
+            if selection.contains(where: \.requiresTrivialCount) {
                 return try fetchTrivialCount(db)
             }