wip

Author: mbrandonw

Sources/SharingGRDBCore/FetchKey.swift

@@ -311,11 +311,11 @@ public struct FetchKey<Value: Sendable>: SharedReaderKey {
       continuation.resumeReturningInitialValue()
       return
     }
-    guard !isTesting else {
-      continuation.resume(with: Result { try database.read(request.fetch) })
-      return
-    }
-    let scheduler: any ValueObservationScheduler = scheduler ?? .async(onQueue: .main)
+//    guard !isTesting else {
+//      continuation.resume(with: Result { try database.read(request.fetch) })
+//      return
+//    }
+    let scheduler: any ValueObservationScheduler = scheduler ?? TestImmediateScheduler()
     database.asyncRead { dbResult in
       let result = dbResult.flatMap { db in
         Result {
@@ -345,12 +345,7 @@ public struct FetchKey<Value: Sendable>: SharedReaderKey {
       Result { try request.fetch(db) }
     }
 
-    let scheduler: any ValueObservationScheduler
-    if isTesting {
-      scheduler = TestImmediateScheduler()
-    } else {
-      scheduler = self.scheduler ?? .async(onQueue: .main)
-    }
+    let scheduler = self.scheduler ?? TestImmediateScheduler()
     #if canImport(Combine)
       let dropFirst =
         switch context {
@@ -439,14 +434,6 @@ public struct NotFound: Error {
 package struct TestImmediateScheduler: ValueObservationScheduler, Hashable {
   package func immediateInitialValue() -> Bool { true }
   package func schedule(_ action: @escaping @Sendable () -> Void) {
-    if Thread.isMainThread {
-      DispatchQueue.main.sync {
-        action()
-      }
-    } else {
-      DispatchQueue.main.async {
-        action()
-      }
-    }
+    action()
   }
 }

Tests/SharingGRDBTests/FetchAllTests.swift

@@ -12,6 +12,7 @@ import Testing
 struct FetchAllTests {
   @Dependency(\.defaultDatabase) var database
 
+  @MainActor
   @Test func concurrency() async throws {
     let count = 1_000
     try await database.write { db in