mirror of
https://github.com/groue/GRDB.swift
synced 2026-11-22 04:00:39 +00:00
TransactionClock is Sendable
This commit is contained in:
1 parent
e0d8e20bef
commit
f7dc72a5f3
3 files changed
+35
-35
No files matched your search
@@ -10,7 +10,7 @@ import Foundation
|
||||
///
|
||||
/// - ``DefaultTransactionClock``
|
||||
/// - ``CustomTransactionClock``
|
||||
public protocol TransactionClock {
|
||||
public protocol TransactionClock: Sendable {
|
||||
/// Returns the date of the current transaction.
|
||||
///
|
||||
/// This function is called whenever a transaction starts - precisely
|
||||
@@ -36,7 +36,7 @@ extension TransactionClock where Self == CustomTransactionClock {
|
||||
///
|
||||
/// It is also called when the ``Database/transactionDate`` property is
|
||||
/// called, and the database connection is not in a transaction.
|
||||
public static func custom(_ now: @escaping (Database) throws -> Date) -> Self {
|
||||
public static func custom(_ now: @escaping @Sendable (Database) throws -> Date) -> Self {
|
||||
CustomTransactionClock(now)
|
||||
}
|
||||
}
|
||||
@@ -53,9 +53,9 @@ public struct DefaultTransactionClock: TransactionClock {
|
||||
|
||||
/// A custom transaction clock.
|
||||
public struct CustomTransactionClock: TransactionClock {
|
||||
let _now: (Database) throws -> Date
|
||||
let _now: @Sendable (Database) throws -> Date
|
||||
|
||||
public init(_ now: @escaping (Database) throws -> Date) {
|
||||
public init(_ now: @escaping @Sendable (Database) throws -> Date) {
|
||||
self._now = now
|
||||
}
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
- [ ] columnexpression
|
||||
- [ ] commontableexpression
|
||||
- [ ] configuration
|
||||
- [ ] customtransactionclock
|
||||
- [X] customtransactionclock
|
||||
- [X] database/busymode
|
||||
- [ ] databaseaggregate
|
||||
- [ ] databasecancellable
|
||||
@@ -131,7 +131,7 @@
|
||||
- [ ] databasepublishers/write
|
||||
- [ ] databaseregionobservation
|
||||
- [ ] databaseuuidencodingstrategy
|
||||
- [ ] defaulttransactionclock
|
||||
- [X] defaulttransactionclock
|
||||
- [ ] fetchablerecorddecoder
|
||||
- [ ] fetchrequest
|
||||
- [ ] filtercursor
|
||||
@@ -169,7 +169,7 @@
|
||||
- [ ] sqlsubquery
|
||||
- [ ] sqlsubqueryable
|
||||
- [ ] tablealias
|
||||
- [ ] transactionclock
|
||||
- [X] transactionclock
|
||||
- [ ] valueobservation
|
||||
- [ ] valueobservationscheduler
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@ class TransactionDateTests: GRDBTestCase {
|
||||
Date(),
|
||||
Date.distantFuture,
|
||||
]
|
||||
var dateIterator = dates.makeIterator()
|
||||
let dateIteratorMutex = Mutex(dates.makeIterator())
|
||||
dbConfiguration.transactionClock = .custom { _ in
|
||||
dateIterator.next()!
|
||||
dateIteratorMutex.withLock { $0.next()! }
|
||||
}
|
||||
|
||||
var collectedDates: [Date] = []
|
||||
@@ -28,9 +28,9 @@ class TransactionDateTests: GRDBTestCase {
|
||||
Date(),
|
||||
Date.distantFuture,
|
||||
]
|
||||
var dateIterator = dates.makeIterator()
|
||||
let dateIteratorMutex = Mutex(dates.makeIterator())
|
||||
dbConfiguration.transactionClock = .custom { _ in
|
||||
dateIterator.next()!
|
||||
dateIteratorMutex.withLock { $0.next()! }
|
||||
}
|
||||
|
||||
var collectedDates: [Date] = []
|
||||
@@ -51,9 +51,9 @@ class TransactionDateTests: GRDBTestCase {
|
||||
Date(),
|
||||
Date.distantFuture,
|
||||
]
|
||||
var dateIterator = dates.makeIterator()
|
||||
let dateIteratorMutex = Mutex(dates.makeIterator())
|
||||
dbConfiguration.transactionClock = .custom { _ in
|
||||
dateIterator.next()!
|
||||
dateIteratorMutex.withLock { $0.next()! }
|
||||
}
|
||||
|
||||
var collectedDates: [Date] = []
|
||||
@@ -74,9 +74,9 @@ class TransactionDateTests: GRDBTestCase {
|
||||
Date(),
|
||||
Date.distantFuture,
|
||||
]
|
||||
var dateIterator = dates.makeIterator()
|
||||
let dateIteratorMutex = Mutex(dates.makeIterator())
|
||||
dbConfiguration.transactionClock = .custom { _ in
|
||||
dateIterator.next()!
|
||||
dateIteratorMutex.withLock { $0.next()! }
|
||||
}
|
||||
|
||||
var collectedDates: [Date] = []
|
||||
@@ -107,8 +107,8 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
var currentDate = Date.distantPast
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate }
|
||||
let currentDate = Mutex(Date.distantPast)
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate.value }
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.write { db in
|
||||
try db.create(table: "player") { t in
|
||||
@@ -119,7 +119,7 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
currentDate = Date.distantPast
|
||||
currentDate.value = Date.distantPast
|
||||
try dbQueue.write { db in
|
||||
do {
|
||||
var player = Player(name: "Arthur")
|
||||
@@ -152,8 +152,8 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
var currentDate = Date.distantPast
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate }
|
||||
let currentDate = Mutex(Date.distantPast)
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate.value }
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.write { db in
|
||||
try db.create(table: "player") { t in
|
||||
@@ -164,14 +164,14 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
currentDate = Date.distantPast
|
||||
currentDate.value = Date.distantPast
|
||||
try dbQueue.write { db in
|
||||
var player = Player(name: "Arthur")
|
||||
try player.insert(db)
|
||||
}
|
||||
|
||||
let newTransactionDate = Date()
|
||||
currentDate = newTransactionDate
|
||||
currentDate.value = newTransactionDate
|
||||
try dbQueue.write { db in
|
||||
var player = try Player.find(db, key: 1)
|
||||
|
||||
@@ -198,8 +198,8 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
var currentDate = Date.distantPast
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate }
|
||||
let currentDate = Mutex(Date.distantPast)
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate.value }
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.write { db in
|
||||
try db.create(table: "player") { t in
|
||||
@@ -210,14 +210,14 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
currentDate = Date.distantPast
|
||||
currentDate.value = Date.distantPast
|
||||
try dbQueue.write { db in
|
||||
var player = Player(name: "Arthur")
|
||||
try player.insert(db)
|
||||
}
|
||||
|
||||
let newTransactionDate = Date()
|
||||
currentDate = newTransactionDate
|
||||
currentDate.value = newTransactionDate
|
||||
try dbQueue.write { db in
|
||||
var player = try Player.find(db, key: 1)
|
||||
|
||||
@@ -251,8 +251,8 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
var currentDate = Date.distantPast
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate }
|
||||
let currentDate = Mutex(Date.distantPast)
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate.value }
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.write { db in
|
||||
try db.create(table: "player") { t in
|
||||
@@ -267,7 +267,7 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
|
||||
let newTransactionDate = Date()
|
||||
currentDate = newTransactionDate
|
||||
currentDate.value = newTransactionDate
|
||||
try dbQueue.write { db in
|
||||
var player = try Player.find(db, key: 1)
|
||||
try player.touch(db)
|
||||
@@ -303,8 +303,8 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
var currentDate = Date.distantPast
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate }
|
||||
let currentDate = Mutex(Date.distantPast)
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate.value }
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.write { db in
|
||||
try db.create(table: "player") { t in
|
||||
@@ -315,7 +315,7 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
currentDate = Date.distantPast
|
||||
currentDate.value = Date.distantPast
|
||||
try dbQueue.write { db in
|
||||
var player = Player(name: "Arthur", isInserted: false)
|
||||
try player.insert(db)
|
||||
@@ -354,8 +354,8 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
var currentDate = Date.distantPast
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate }
|
||||
let currentDate = Mutex(Date.distantPast)
|
||||
dbConfiguration.transactionClock = .custom { _ in currentDate.value }
|
||||
let dbQueue = try makeDatabaseQueue()
|
||||
try dbQueue.write { db in
|
||||
try db.create(table: "player") { t in
|
||||
@@ -366,7 +366,7 @@ class TransactionDateTests: GRDBTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
currentDate = Date.distantPast
|
||||
currentDate.value = Date.distantPast
|
||||
try dbQueue.write { db in
|
||||
let player = Player(name: "Arthur")
|
||||
try player.insert(db)
|
||||
|
||||
Reference in new issue
Block a user