Merge branch 'development'

Author: groue

.github/workflows/CI.yml

@@ -1,3 +1,5 @@
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
+
 name: "GRDB CI"
 
 on:
@@ -9,12 +11,14 @@ on:
       - 'GRDB/**'
       - 'Tests/**'
       - '.github/workflows/**'
+      - 'Makefile'
       - 'Package.swift'
   pull_request:
     paths:
       - 'GRDB/**'
       - 'Tests/**'
       - '.github/workflows/**'
+      - 'Makefile'
       - 'Package.swift'
 
 concurrency: 
@@ -24,114 +28,124 @@ permissions:
   contents: read
 
 jobs:
-  macOS:
-    name: macOS
+  Framework:
+    name: Framework
     runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         include:
+          - xcode: "Xcode_14.1.app"
+            runsOn: macOS-12
+            destination: "platform=macOS"
+            name: "macOS"
+          - xcode: "Xcode_14.1.app"
+            runsOn: macOS-12
+            destination: "OS=16.1,name=iPhone 14"
+            name: "iOS"
+          - xcode: "Xcode_14.1.app"
+            runsOn: macOS-12
+            destination: "OS=16.1,name=Apple TV"
+            name: "tvOS"
           - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
-            shell: "/bin/zsh {0}"
-    steps:
-      - uses: actions/checkout@v3
-      - name: ${{ matrix.name }}
-        run: make test_framework_GRDBOSX_maxSwift
-  iOS:
-    name: iOS
-    runs-on: ${{ matrix.runsOn }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
+            destination: "platform=macOS"
+            name: "macOS"
           - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
-            shell: "/bin/zsh {0}"
+            destination: "OS=16.0,name=iPhone 14"
+            name: "iOS"
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
-        run: make test_framework_GRDBiOS_maxTarget_maxSwift
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project GRDB.xcodeproj -scheme GRDB -destination "${{ matrix.destination }}" OTHER_SWIFT_FLAGS='$(inherited) -D SQLITE_ENABLE_FTS5 -D SQLITE_ENABLE_PREUPDATE_HOOK' GCC_PREPROCESSOR_DEFINITIONS='$(inherited) GRDB_SQLITE_ENABLE_PREUPDATE_HOOK=1' clean test
   SPM:
     name: SPM
     runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         include:
+          - xcode: "Xcode_14.1.app"
+            runsOn: macOS-12
+            name: "Xcode 14.1"
           - xcode: "Xcode_14.0.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
-            shell: "/bin/zsh {0}"
+            name: "Xcode 14.0.1"
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
         run: make test_SPM test_install_SPM
   SQLCipher3:
     name: SQLCipher3
     runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.0.1.app"
+          - xcode: "Xcode_14.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
-            shell: "/bin/zsh {0}"
+            name: "Xcode 14.1"
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
         run: make test_framework_SQLCipher3Encrypted
   SQLCipher4:
     name: SQLCipher4
     runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.0.1.app"
+          - xcode: "Xcode_14.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
-            shell: "/bin/zsh {0}"
+            name: "Xcode 14.1"
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
         run: make test_framework_SQLCipher4Encrypted
   CustomSQLite:
     name: CustomSQLite
     runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.0.1.app"
+          - xcode: "Xcode_14.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
-            shell: "/bin/zsh {0}"
+            name: "Xcode 14.1"
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}
         run: make test_framework_GRDBCustomSQLiteOSX
   XCFramework:
     name: XCFramework
     runs-on: ${{ matrix.runsOn }}
+    env:
+      DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}/Contents/Developer"
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_14.0.1.app"
+          - xcode: "Xcode_14.1.app"
             runsOn: macOS-12
-            name: "macOS 12, Xcode 14.0.1, Swift 5.7"
-            shell: "/bin/zsh {0}"
+            name: "Xcode 14.1"
     steps:
       - uses: actions/checkout@v3
       - name: ${{ matrix.name }}

CHANGELOG.md

@@ -7,6 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 #### 6.x Releases
 
+- `6.6.x` Releases - [6.6.0](#660)
 - `6.5.x` Releases - [6.5.0](#650)
 - `6.4.x` Releases - [6.4.0](#640)
 - `6.3.x` Releases - [6.3.0](#630) - [6.3.1](#631)
@@ -103,6 +104,12 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
 
 ---
 
+## 6.6.0
+
+Released December 29, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.5.0...v6.6.0)
+
+- **New**: [#1304](https://github.com/groue/GRDB.swift/pull/1304) by [@groue](https://github.com/groue): Expose generated columns with availability checks
+
 ## 6.5.0
 
 Released December 5, 2022 • [diff](https://github.com/groue/GRDB.swift/compare/v6.4.0...v6.5.0)

Documentation/Combine.md

@@ -398,7 +398,7 @@ let cancellable = hallOfFamePublisher.sink(
 [`writePublisher(receiveOn:updates:thenRead:)`]: #databasewriterwritepublisherreceiveonupdatesthenread
 [`migratePublisher(_:receiveOn:)`]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasemigrator/migratepublisher(_:receiveon:)
 [configured]: ../README.md#databasepool-configuration
-[database pool]: ../README.md#database-pools
-[database queue]: ../README.md#database-queues
+[database pool]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasepool
+[database queue]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasequeue
 [database snapshot]: https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasesnapshot
 [scheduler]: https://developer.apple.com/documentation/combine/scheduler

Documentation/CustomSQLiteBuilds.md

@@ -21,7 +21,7 @@ GRDB builds SQLite with [swiftlyfalling/SQLiteLib](https://github.com/swiftlyfal
 
 2. Choose your [extra compilation options](https://www.sqlite.org/compile.html). For example, `SQLITE_ENABLE_FTS5`, `SQLITE_ENABLE_PREUPDATE_HOOK`.
 
-    It is recommended that you enable the `SQLITE_ENABLE_SNAPSHOT` option. It allows GRDB to optimize [ValueObservation](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/valueobservation) when you use a [Database Pool](../README.md#database-pools).
+    It is recommended that you enable the `SQLITE_ENABLE_SNAPSHOT` option. It allows GRDB to optimize [ValueObservation](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/valueobservation) when you use a [Database Pool](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databasepool).
 
 3. Create a folder named `GRDBCustomSQLite` somewhere in your project directory.
 

Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -17,7 +17,7 @@ struct AppDatabase {
     /// Application can use a `DatabasePool`, while SwiftUI previews and tests
     /// can use a fast in-memory `DatabaseQueue`.
     ///
-    /// See <https://github.com/groue/GRDB.swift/blob/master/README.md#database-connections>
+    /// See <https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databaseconnections>
     private let dbWriter: any DatabaseWriter
 
     /// The DatabaseMigrator that defines the database schema.
@@ -162,7 +162,7 @@ extension AppDatabase {
 // reading methods.
 extension AppDatabase {
     /// Provides a read-only access to the database
-    var databaseReader: DatabaseReader {
+    var reader: DatabaseReader {
         dbWriter
     }
 }

Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/AppDatabase.swift

@@ -24,7 +24,7 @@ extension AppDatabase {
             try fileManager.createDirectory(at: folderURL, withIntermediateDirectories: true)
 
             // Connect to a database on disk
-            // See https://github.com/groue/GRDB.swift/blob/master/README.md#database-connections
+            // See https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databaseconnections
             let dbURL = folderURL.appendingPathComponent("db.sqlite")
             let dbPool = try DatabasePool(path: dbURL.path)
 
@@ -58,7 +58,7 @@ extension AppDatabase {
     /// Creates an empty database for SwiftUI previews
     static func empty() -> AppDatabase {
         // Connect to an in-memory database
-        // See https://github.com/groue/GRDB.swift/blob/master/README.md#database-connections
+        // See https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databaseconnections
         let dbQueue = try! DatabaseQueue()
         return try! AppDatabase(dbQueue)
     }

Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/Persistence.swift

@@ -29,12 +29,12 @@ struct PlayerRequest: Queryable {
 
     func publisher(in appDatabase: AppDatabase) -> AnyPublisher<[Player], Error> {
         // Build the publisher from the general-purpose read-only access
-        // granted by `appDatabase.databaseReader`.
+        // granted by `appDatabase.reader`.
         // Some apps will prefer to call a dedicated method of `appDatabase`.
         ValueObservation
             .tracking(fetchValue(_:))
             .publisher(
-                in: appDatabase.databaseReader,
+                in: appDatabase.reader,
                 // The `.immediate` scheduling feeds the view right on
                 // subscription, and avoids an undesired animation when the
                 // application starts.

Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/PlayerRequest.swift

@@ -18,7 +18,7 @@ struct AppDatabase {
     /// Application can use a `DatabasePool`, while SwiftUI previews and tests
     /// can use a fast in-memory `DatabaseQueue`.
     ///
-    /// See <https://github.com/groue/GRDB.swift/blob/master/README.md#database-connections>
+    /// See <https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databaseconnections>
     private let dbWriter: any DatabaseWriter
 
     /// The DatabaseMigrator that defines the database schema.
@@ -163,7 +163,7 @@ extension AppDatabase {
 // reading methods.
 extension AppDatabase {
     /// Provides a read-only access to the database
-    var databaseReader: DatabaseReader {
+    var reader: DatabaseReader {
         dbWriter
     }
 }