Upgrade demo apps

groue · groue · commit 0b92c856ae27 · 2022-12-29T14:06:18.000+01:00
diff --git a/Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/AppDatabase.swift b/Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/AppDatabase.swift
@@ -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
     }
 }
diff --git a/Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/PlayerRequest.swift b/Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/PlayerRequest.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.
diff --git a/Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo/AppDatabase.swift b/Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo/AppDatabase.swift
@@ -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
     }
 }
diff --git a/Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo/PlayerRequest.swift b/Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo/PlayerRequest.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.
diff --git a/Documentation/DemoApps/GRDBDemoiOS/GRDBDemoiOS/AppDatabase.swift b/Documentation/DemoApps/GRDBDemoiOS/GRDBDemoiOS/AppDatabase.swift
@@ -127,7 +127,7 @@ extension AppDatabase {
 // reading methods.
 extension AppDatabase {
     /// Provides a read-only access to the database
-    var databaseReader: DatabaseReader {
+    var reader: DatabaseReader {
         dbWriter
     }
 }
diff --git a/Documentation/DemoApps/GRDBDemoiOS/GRDBDemoiOS/ViewControllers/PlayerListViewController.swift b/Documentation/DemoApps/GRDBDemoiOS/GRDBDemoiOS/ViewControllers/PlayerListViewController.swift
@@ -138,7 +138,7 @@ class PlayerListViewController: UITableViewController {
         playersCancellable = ValueObservation
             .tracking(request.fetchAll(_:))
             .start(
-                in: AppDatabase.shared.databaseReader,
+                in: AppDatabase.shared.reader,
                 // Immediate scheduling feeds the data source right on subscription,
                 // and avoids an undesired animation when the application starts.
                 scheduling: .immediate,

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ extension AppDatabase {`
`162`	`162`	`// reading methods.`
`163`	`163`	`extension AppDatabase {`
`164`	`164`	`/// Provides a read-only access to the database`
`165`		`- var databaseReader: DatabaseReader {`
	`165`	`+ var reader: DatabaseReader {`
`166`	`166`	`dbWriter`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ extension AppDatabase {`
`163`	`163`	`// reading methods.`
`164`	`164`	`extension AppDatabase {`
`165`	`165`	`/// Provides a read-only access to the database`
`166`		`- var databaseReader: DatabaseReader {`
	`166`	`+ var reader: DatabaseReader {`
`167`	`167`	`dbWriter`
`168`	`168`	`}`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ extension AppDatabase {`
`127`	`127`	`// reading methods.`
`128`	`128`	`extension AppDatabase {`
`129`	`129`	`/// Provides a read-only access to the database`
`130`		`- var databaseReader: DatabaseReader {`
	`130`	`+ var reader: DatabaseReader {`
`131`	`131`	`dbWriter`
`132`	`132`	`}`
`133`	`133`	`}`