From 4d4b02d0760f1ac27727cefcb2e5b9f34a258475 Mon Sep 17 00:00:00 2001 From: Dmitry Mazurenko Date: Wed, 10 Oct 2018 16:48:04 +0300 Subject: [PATCH] Fix queue validation for UnsafeDataTransaction --- Sources/BaseDataTransaction.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Sources/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift index fb53382..cbee498 100644 --- a/Sources/BaseDataTransaction.swift +++ b/Sources/BaseDataTransaction.swift @@ -223,7 +223,7 @@ public /*abstract*/ class BaseDataTransaction { public func insertedObjects(_ entity: D.Type) -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access inserted objects from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -241,7 +241,7 @@ public /*abstract*/ class BaseDataTransaction { public func insertedObjectIDs() -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -260,7 +260,7 @@ public /*abstract*/ class BaseDataTransaction { public func insertedObjectIDs(_ entity: D.Type) -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -279,7 +279,7 @@ public /*abstract*/ class BaseDataTransaction { public func updatedObjects(_ entity: D.Type) -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access updated objects from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -297,7 +297,7 @@ public /*abstract*/ class BaseDataTransaction { public func updatedObjectIDs() -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -316,7 +316,7 @@ public /*abstract*/ class BaseDataTransaction { public func updatedObjectIDs(_ entity: D.Type) -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -335,7 +335,7 @@ public /*abstract*/ class BaseDataTransaction { public func deletedObjects(_ entity: D.Type) -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access deleted objects from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -354,7 +354,7 @@ public /*abstract*/ class BaseDataTransaction { public func deletedObjectIDs() -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert( @@ -373,7 +373,7 @@ public /*abstract*/ class BaseDataTransaction { public func deletedObjectIDs(_ entity: D.Type) -> Set { CoreStore.assert( - self.transactionQueue.cs_isCurrentExecutionContext(), + self.isRunningInAllowedQueue(), "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue." ) CoreStore.assert(