⚠️ TO BE REVERTED - StrictConcurrency/tests: Wait for SE-0418

Revert when apple/swift#73313 is fixed
groue · Apr 28, 2024 · 0a1cdf2 · 0a1cdf2
1 parent e649f17
commit 0a1cdf2
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 70 deletions.
diff --git a/Package.swift b/Package.swift
@@ -7,6 +7,9 @@ import PackageDescription
 var swiftSettings: [SwiftSetting] = [
     .define("SQLITE_ENABLE_FTS5"),
     .enableUpcomingFeature("StrictConcurrency"),
+    // Can't enable SE-0418 Inferring Sendable for methods and key path literals
+    // yet, because of <https://github.com/apple/swift/issues/73313>
+    // .enableUpcomingFeature("InferSendableFromCaptures")
 ]
 var cSettings: [CSetting] = []
 var dependencies: [PackageDescription.Package.Dependency] = []

diff --git a/Support/GRDB.xcconfig b/Support/GRDB.xcconfig
@@ -8,3 +8,7 @@ MODULEMAP_FILE = $(SRCROOT)/Support/module.modulemap
 // OTHER_SWIFT_FLAGS = $(inherited) -Xfrontend -warn-long-expression-type-checking=100 -Xfrontend -warn-long-function-bodies=100
 
 SWIFT_STRICT_CONCURRENCY = complete
+
+// Can't enable SE-0418 Inferring Sendable for methods and key path literals
+// yet, because of <https://github.com/apple/swift/issues/73313>
+// OTHER_SWIFT_FLAGS = $(inherited) -enable-upcoming-feature InferSendableFromCaptures
diff --git a/Tests/GRDBCombineTests/ValueObservationPublisherTests.swift b/Tests/GRDBCombineTests/ValueObservationPublisherTests.swift
@@ -33,7 +33,7 @@ class ValueObservationPublisherTests : XCTestCase {
 
         func test(writer: some DatabaseWriter) throws {
             let publisher = ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer)
             let recorder = publisher.record()
 
@@ -78,7 +78,7 @@ class ValueObservationPublisherTests : XCTestCase {
             let expectation = self.expectation(description: "")
             let semaphore = DispatchSemaphore(value: 0)
             let cancellable = ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer)
                 .sink(
                     receiveCompletion: { _ in },
@@ -135,7 +135,7 @@ class ValueObservationPublisherTests : XCTestCase {
 
         func test(writer: some DatabaseWriter) throws {
             let publisher = ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer, scheduling: .immediate)
             let recorder = publisher.record()
 
@@ -187,7 +187,7 @@ class ValueObservationPublisherTests : XCTestCase {
                 })
 
             let observationCancellable = ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer, scheduling: .immediate)
                 .subscribe(testSubject)
 
@@ -279,7 +279,7 @@ class ValueObservationPublisherTests : XCTestCase {
                     receiveValue: { _ in expectation.fulfill() })
 
             ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer)
                 .subscribe(subscriber)
 
@@ -316,7 +316,7 @@ class ValueObservationPublisherTests : XCTestCase {
             })
 
             ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer)
                 .subscribe(subscriber)
 
@@ -355,7 +355,7 @@ class ValueObservationPublisherTests : XCTestCase {
                     receiveValue: { _ in expectation.fulfill() })
 
             ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer, scheduling: .immediate /* make sure we get the initial db state */)
                 .subscribe(subscriber)
 
@@ -399,7 +399,7 @@ class ValueObservationPublisherTests : XCTestCase {
                 })
 
             ValueObservation
-                .trackingConstantRegion(Player.fetchCount)
+                .trackingConstantRegion { try Player.fetchCount($0) }
                 .publisher(in: writer, scheduling: .immediate /* make sure we get two db states */)
                 .subscribe(subscriber)
 

diff --git a/Tests/GRDBTests/AssociationHasOneThroughDecodableRecordTests.swift b/Tests/GRDBTests/AssociationHasOneThroughDecodableRecordTests.swift
@@ -73,7 +73,7 @@ class AssociationHasOneThroughDecodableRecordTests: GRDBTestCase {
             .including(required: A.c)
             .order(sql: "a.id")
             .asRequest(of: AWithRequiredC.self)
-        let records = try dbQueue.inDatabase(request.fetchAll)
+        let records = try dbQueue.inDatabase { try request.fetchAll($0) }
 
         XCTAssertEqual(records.count, 1)
 
@@ -90,7 +90,7 @@ class AssociationHasOneThroughDecodableRecordTests: GRDBTestCase {
             .including(optional: AWithOptionalC.c)
             .order(sql: "a.id")
             .asRequest(of: AWithOptionalC.self)
-        let records = try dbQueue.inDatabase(request.fetchAll)
+        let records = try dbQueue.inDatabase { try request.fetchAll($0) }
 
         XCTAssertEqual(records.count, 3)
 
@@ -116,7 +116,7 @@ class AssociationHasOneThroughDecodableRecordTests: GRDBTestCase {
         let request = A
             .joining(required: A.c)
             .order(sql: "a.id")
-        let records = try dbQueue.inDatabase(request.fetchAll)
+        let records = try dbQueue.inDatabase { try request.fetchAll($0) }
 
         XCTAssertEqual(records.count, 1)
 
@@ -130,7 +130,7 @@ class AssociationHasOneThroughDecodableRecordTests: GRDBTestCase {
         let request = A
             .joining(optional: A.c)
             .order(sql: "a.id")
-        let records = try dbQueue.inDatabase(request.fetchAll)
+        let records = try dbQueue.inDatabase { try request.fetchAll($0) }
 
         XCTAssertEqual(records.count, 3)
 
@@ -154,7 +154,7 @@ class AssociationHasOneThroughDecodableRecordTests: GRDBTestCase {
             .including(required: A.b)
             .order(sql: "a.id")
             .asRequest(of: AWithRequiredBAndOptionalC.self)
-        let records = try dbQueue.inDatabase(request.fetchAll)
+        let records = try dbQueue.inDatabase { try request.fetchAll($0) }
 
         XCTAssertEqual(records.count, 2)
 

diff --git a/Tests/GRDBTests/DatabasePoolTests.swift b/Tests/GRDBTests/DatabasePoolTests.swift
@@ -148,7 +148,7 @@ class DatabasePoolTests: GRDBTestCase {
         }
         do {
             let dbPool = try makeDatabasePool(filename: "test")
-            let count = try dbPool.read(Table("t").fetchCount)
+            let count = try dbPool.read { try Table("t").fetchCount($0) }
             XCTAssertEqual(count, 0)
         }
     }

diff --git a/Tests/GRDBTests/SharedValueObservationTests.swift b/Tests/GRDBTests/SharedValueObservationTests.swift
@@ -12,7 +12,7 @@ class SharedValueObservationTests: GRDBTestCase {
 
         let log = Log()
         var sharedObservation: SharedValueObservation<Int>? = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .print(to: log)
             .shared(
                 in: dbQueue,
@@ -64,7 +64,7 @@ class SharedValueObservationTests: GRDBTestCase {
 
         let log = Log()
         var sharedObservation: SharedValueObservation<Int>? = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .print(to: log)
             .shared(
                 in: dbQueue,
@@ -116,7 +116,7 @@ class SharedValueObservationTests: GRDBTestCase {
         }
 
         let publisher = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .shared(
                 in: dbQueue,
                 scheduling: .immediate)
@@ -148,7 +148,7 @@ class SharedValueObservationTests: GRDBTestCase {
 
         let log = Log()
         var sharedObservation: SharedValueObservation<Int>? = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .print(to: log)
             .shared(
                 in: dbQueue,
@@ -200,7 +200,7 @@ class SharedValueObservationTests: GRDBTestCase {
 
         let log = Log()
         var sharedObservation: SharedValueObservation<Int>? = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .print(to: log)
             .shared(
                 in: dbQueue,
@@ -246,7 +246,7 @@ class SharedValueObservationTests: GRDBTestCase {
 
         let log = Log()
         var sharedObservation: SharedValueObservation<Int>? = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .print(to: log)
             .shared(
                 in: dbQueue,
@@ -341,7 +341,7 @@ class SharedValueObservationTests: GRDBTestCase {
         let log = Log()
         let sharedObservationMutex: Mutex<SharedValueObservation<Int>?> = Mutex(nil)
         sharedObservationMutex.store(ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .print(to: log)
             .shared(
                 in: dbQueue,
@@ -394,7 +394,7 @@ class SharedValueObservationTests: GRDBTestCase {
         }
 
         let publisher = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .shared(in: dbQueue) // default async
             .publisher()
 
@@ -426,7 +426,7 @@ class SharedValueObservationTests: GRDBTestCase {
 
         let log = Log()
         var sharedObservation: SharedValueObservation<Int>? = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .print(to: log)
             .shared(
                 in: dbQueue,
@@ -632,7 +632,7 @@ class SharedValueObservationTests: GRDBTestCase {
         }
 
         let values = ValueObservation
-            .tracking(Table("player").fetchCount)
+            .tracking { try Table("player").fetchCount($0) }
             .shared(in: dbQueue)
             .values()
 

diff --git a/Tests/GRDBTests/ValueObservationCountTests.swift b/Tests/GRDBTests/ValueObservationCountTests.swift
@@ -6,7 +6,7 @@ class ValueObservationCountTests: GRDBTestCase {
         struct T: TableRecord { }
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(T.fetchCount),
+            ValueObservation.trackingConstantRegion { try T.fetchCount($0) },
             records: [0, 1, 1, 2, 3, 4],
             setup: { db in
                 try db.execute(sql: "CREATE TABLE t(id INTEGER PRIMARY KEY AUTOINCREMENT)")
@@ -29,7 +29,7 @@ class ValueObservationCountTests: GRDBTestCase {
         struct T: TableRecord { }
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(T.fetchCount).removeDuplicates(),
+            ValueObservation.trackingConstantRegion { try T.fetchCount($0) }.removeDuplicates(),
             records: [0, 1, 2, 3, 4],
             setup: { db in
                 try db.execute(sql: "CREATE TABLE t(id INTEGER PRIMARY KEY AUTOINCREMENT)")

diff --git a/Tests/GRDBTests/ValueObservationDatabaseValueConvertibleTests.swift b/Tests/GRDBTests/ValueObservationDatabaseValueConvertibleTests.swift
@@ -21,7 +21,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         let request = SQLRequest<Name>(sql: "SELECT name FROM t ORDER BY id")
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchAll),
+            ValueObservation.trackingConstantRegion { try request.fetchAll($0) },
             records: [
                 [],
                 [Name(rawValue: "foo")],
@@ -44,7 +44,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         })
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchAll).removeDuplicates(),
+            ValueObservation.trackingConstantRegion { try request.fetchAll($0) }.removeDuplicates(),
             records: [
                 [],
                 [Name(rawValue: "foo")],
@@ -70,7 +70,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         let request = SQLRequest<Name>(sql: "SELECT name FROM t ORDER BY id DESC")
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchOne),
+            ValueObservation.trackingConstantRegion { try request.fetchOne($0) },
             records: [
                 nil,
                 Name(rawValue: "foo"),
@@ -103,7 +103,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         })
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchOne).removeDuplicates(),
+            ValueObservation.trackingConstantRegion { try request.fetchOne($0) }.removeDuplicates(),
             records: [
                 nil,
                 Name(rawValue: "foo"),
@@ -137,7 +137,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         let request = SQLRequest<Name?>(sql: "SELECT name FROM t ORDER BY id")
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchAll),
+            ValueObservation.trackingConstantRegion { try request.fetchAll($0) },
             records: [
                 [],
                 [Name(rawValue: "foo")],
@@ -160,7 +160,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         })
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchAll).removeDuplicates(),
+            ValueObservation.trackingConstantRegion { try request.fetchAll($0) }.removeDuplicates(),
             records: [
                 [],
                 [Name(rawValue: "foo")],
@@ -186,7 +186,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         let request = SQLRequest<Name?>(sql: "SELECT name FROM t ORDER BY id DESC")
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchOne),
+            ValueObservation.trackingConstantRegion { try request.fetchOne($0) },
             records: [
                 .none,
                 Name(rawValue: "foo"),
@@ -221,7 +221,7 @@ class ValueObservationDatabaseValueConvertibleTests: GRDBTestCase {
         })
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchOne).removeDuplicates(),
+            ValueObservation.trackingConstantRegion { try request.fetchOne($0) }.removeDuplicates(),
             records: [
                 .none,
                 Name(rawValue: "foo"),

diff --git a/Tests/GRDBTests/ValueObservationFetchTests.swift b/Tests/GRDBTests/ValueObservationFetchTests.swift
@@ -196,7 +196,7 @@ class ValueObservationFetchTests: GRDBTestCase {
     func testRemoveDuplicates() throws {
         try assertValueObservation(
             ValueObservation
-                .trackingConstantRegion(Table("t").fetchCount)
+                .trackingConstantRegion { try Table("t").fetchCount($0) }
                 .removeDuplicates(),
             records: [0, 1, 2],
             setup: { db in

diff --git a/Tests/GRDBTests/ValueObservationMapTests.swift b/Tests/GRDBTests/ValueObservationMapTests.swift
@@ -4,7 +4,7 @@ import GRDB
 class ValueObservationMapTests: GRDBTestCase {
     func testMap() throws {
         let valueObservation = ValueObservation
-            .trackingConstantRegion(Table("t").fetchCount)
+            .trackingConstantRegion { try Table("t").fetchCount($0) }
             .map { "\($0)" }
 
         try assertValueObservation(

diff --git a/Tests/GRDBTests/ValueObservationQueryInterfaceRequestTests.swift b/Tests/GRDBTests/ValueObservationQueryInterfaceRequestTests.swift
@@ -76,7 +76,7 @@ class ValueObservationQueryInterfaceRequestTests: GRDBTestCase {
             .including(all: Parent.children.orderByPrimaryKey())
             .orderByPrimaryKey()
             .asRequest(of: Row.self)
-        let observation = ValueObservation.trackingConstantRegion(request.fetchOne)
+        let observation = ValueObservation.trackingConstantRegion { try request.fetchOne($0) }
 
         let recorder = observation.record(in: dbQueue)
         try dbQueue.writeWithoutTransaction(performDatabaseModifications)
@@ -113,7 +113,7 @@ class ValueObservationQueryInterfaceRequestTests: GRDBTestCase {
             .including(all: Parent.children.orderByPrimaryKey())
             .orderByPrimaryKey()
             .asRequest(of: Row.self)
-        let observation = ValueObservation.trackingConstantRegion(request.fetchAll)
+        let observation = ValueObservation.trackingConstantRegion { try request.fetchAll($0) }
 
         let recorder = observation.record(in: dbQueue)
         try dbQueue.writeWithoutTransaction(performDatabaseModifications)
@@ -171,7 +171,7 @@ class ValueObservationQueryInterfaceRequestTests: GRDBTestCase {
             .asRequest(of: ParentInfo.self)
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchOne),
+            ValueObservation.trackingConstantRegion { try request.fetchOne($0) },
             records: [
                 nil,
                 ParentInfo(
@@ -240,7 +240,7 @@ class ValueObservationQueryInterfaceRequestTests: GRDBTestCase {
             .asRequest(of: ParentInfo.self)
 
         try assertValueObservation(
-            ValueObservation.trackingConstantRegion(request.fetchAll),
+            ValueObservation.trackingConstantRegion { try request.fetchAll($0) },
             records: [
                 [],
                 [

diff --git a/Tests/GRDBTests/ValueObservationReadonlyTests.swift b/Tests/GRDBTests/ValueObservationReadonlyTests.swift
@@ -66,7 +66,7 @@ class ValueObservationReadonlyTests: GRDBTestCase {
         try assertValueObservation(
             observation,
             fails: { (_: TestError, writer: DatabaseWriter) in
-                let count = try writer.read(Table("t").fetchCount)
+                let count = try writer.read { try Table("t").fetchCount($0) }
                 XCTAssertEqual(count, 0)
         },
             setup: { db in