Restore groue/GRDB.swift#955

README.md

@@ -213,7 +213,7 @@ This package ships with a [demo app]. See also the [GRDB demo apps] for various
 
 ---
 
-🙌 `@Query` was vastly inspired from [Core Data and SwiftUI](https://davedelong.com/blog/2021/04/03/core-data-and-swiftui/) by [@davedelong](https://github.com/davedelong), with critical improvements contributed by [@steipete](https://github.com/steipete). Many thanks to both of you!
+🙌 `@Query` was vastly inspired from [Core Data and SwiftUI](https://davedelong.com/blog/2021/04/03/core-data-and-swiftui/) by [@davedelong](https://github.com/davedelong), with [a critical improvement](https://github.com/groue/GRDB.swift/pull/955) contributed by [@steipete](https://github.com/steipete). Many thanks to both of you!
 
 
 [Why @Query?]: #why-query

Sources/GRDBQuery/Query.swift

@@ -74,7 +74,10 @@ public struct Query<Request: Queryable>: DynamicProperty {
     public var projectedValue: Binding<Request> {
         Binding(
             get: { tracker.request ?? initialRequest },
-            set: { tracker.request = $0 })
+            set: {
+                tracker.needsInitialRequest = false
+                tracker.request = $0
+            })
     }
 
     /// Creates a `Query`, given a queryable request, and a key path to the
@@ -90,7 +93,7 @@ public struct Query<Request: Queryable>: DynamicProperty {
     public func update() {
         // Feed tracker with necessary information,
         // and make sure tracking has started.
-        if tracker.request == nil {
+        if tracker.needsInitialRequest {
             tracker.request = initialRequest
         }
         tracker.startTrackingIfNecessary(in: database)
@@ -99,6 +102,7 @@ public struct Query<Request: Queryable>: DynamicProperty {
     /// The object that keeps on observing the database as long as it is alive.
     private class Tracker: ObservableObject {
         private(set) var value: Request.Value?
+        var needsInitialRequest = true
         var request: Request? {
             willSet {
                 if request != newValue {