restore NSPersistentStore.affectedStores ARC bug workaround

CoreStore.xcodeproj/project.pbxproj

@@ -293,6 +293,10 @@
 		B546F9741C9C553300D5AC55 /* SetupResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9721C9C553300D5AC55 /* SetupResult.swift */; };
 		B546F9751C9C553300D5AC55 /* SetupResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9721C9C553300D5AC55 /* SetupResult.swift */; };
 		B546F9761C9C553300D5AC55 /* SetupResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9721C9C553300D5AC55 /* SetupResult.swift */; };
+		B5474D152227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
+		B5474D162227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
+		B5474D172227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
+		B5474D182227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
 		B5489F3F1CF5EEBC008B4978 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */; };
 		B5489F401CF5EEBC008B4978 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */; };
 		B5489F411CF5EEBC008B4978 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */; };
@@ -823,6 +827,7 @@
 		B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSQliteStore.swift; sourceTree = "<group>"; };
 		B546F9681C9AF26D00D5AC55 /* CSInMemoryStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSInMemoryStore.swift; sourceTree = "<group>"; };
 		B546F9721C9C553300D5AC55 /* SetupResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetupResult.swift; sourceTree = "<group>"; };
+		B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreStoreFetchRequest.swift; sourceTree = "<group>"; };
 		B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity1.swift; sourceTree = "<group>"; };
 		B5489F3E1CF5EEBC008B4978 /* TestEntity2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity2.swift; sourceTree = "<group>"; };
 		B5489F451CF5F017008B4978 /* TransactionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionTests.swift; sourceTree = "<group>"; };
@@ -1539,6 +1544,7 @@
 			children = (
 				B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */,
 				B5831B741F34AC7A00A9F647 /* RelationshipProtocol.swift */,
+				B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */,
 				B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */,
 				B53B275E1EE3B92E00E9B352 /* CoreStoreManagedObject.swift */,
 				B533C4DA1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift */,
@@ -2028,6 +2034,7 @@
 				B5FE4DA71C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
 				B52F743D1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				B5E8A72021C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D152227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56923FF1EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAE1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5ECDBEC1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
@@ -2226,6 +2233,7 @@
 				B5ECDBEE1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D162227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924001EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAF1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				82BA18D61C4BBD7100A0916E /* NSManagedObjectContext+Transaction.swift in Sources */,
@@ -2424,6 +2432,7 @@
 				B5220E201D130813009BC71E /* CSObjectMonitor.swift in Sources */,
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D182227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924021EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB11FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5220E171D1306DF009BC71E /* UnsafeDataTransaction+Observing.swift in Sources */,
@@ -2622,6 +2631,7 @@
 				B5ECDBEF1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D172227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924011EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB01FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */,

CoreStoreTests/FromTests.swift

@@ -74,31 +74,31 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config1")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
         }
@@ -113,98 +113,98 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
 
                 let from = From<TestEntity1>("Config1")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config2")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>()
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config1")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config2")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
         }
@@ -219,96 +219,96 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(Set(affectedConfigurations), ["PF_DEFAULT_CONFIGURATION_NAME", "Config1"] as Set)
             }
             do {
                 
                 let from = From<TestEntity1>("Config1")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config2")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>()
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
             }
             do {
                 
                 let from = From<TestEntity2>("Config1")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config2")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
         }
@@ -323,94 +323,94 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config1")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config2")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>()
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config2"])
             }
             do {
                 
                 let from = From<TestEntity2>("Config1")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
                 XCTAssertNotNil(request.entity)
-                XCTAssertNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config2")
                 
-                let request = NSFetchRequest<NSFetchRequestResult>()
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
                 let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.affectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.affectedStores?.map { $0.configurationName } ?? []
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config2"])
             }
         }

CoreStoreTests/GroupByTests.swift

@@ -68,7 +68,7 @@ final class GroupByTests: BaseTestCase {
             
             let groupBy = GroupBy<NSManagedObject>(#keyPath(TestEntity1.testString))
             
-            let request = NSFetchRequest<NSFetchRequestResult>()
+            let request = CoreStoreFetchRequest<NSFetchRequestResult>()
             try From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
             groupBy.applyToFetchRequest(request)
             

CoreStoreTests/OrderByTests.swift

@@ -179,7 +179,7 @@ final class OrderByTests: XCTestCase {
     dynamic func test_ThatOrderByClauses_ApplyToFetchRequestsCorrectly() {
         
         let orderBy = OrderBy<NSManagedObject>(.ascending("key"))
-        let request = NSFetchRequest<NSFetchRequestResult>()
+        let request = CoreStoreFetchRequest<NSFetchRequestResult>()
         orderBy.applyToFetchRequest(request)
         XCTAssertNotNil(request.sortDescriptors)
         XCTAssertEqual(request.sortDescriptors ?? [], orderBy.sortDescriptors)

CoreStoreTests/TweakTests.swift

@@ -43,7 +43,7 @@ final class TweakTests: XCTestCase {
             $0.fetchLimit = 200
             $0.predicate = predicate
         }
-        let request = NSFetchRequest<NSFetchRequestResult>()
+        let request = CoreStoreFetchRequest<NSFetchRequestResult>()
         tweak.applyToFetchRequest(request)
         XCTAssertEqual(request.fetchOffset, 100)
         XCTAssertEqual(request.fetchLimit, 200)

CoreStoreTests/WhereTests.swift

@@ -583,7 +583,7 @@ final class WhereTests: XCTestCase {
     dynamic func test_ThatWhereClauses_ApplyToFetchRequestsCorrectly() {
         
         let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
-        let request = NSFetchRequest<NSFetchRequestResult>()
+        let request = CoreStoreFetchRequest<NSFetchRequestResult>()
         whereClause.applyToFetchRequest(request)
         XCTAssertNotNil(request.predicate)
         XCTAssertEqual(request.predicate, whereClause.predicate)

Sources/CSDataStack+Observing.swift

@@ -68,7 +68,7 @@ extension CSDataStack {
             sectionBy: nil,
             applyFetchClauses: { (fetchRequest) in
                 
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
             }
         ).bridgeToObjectiveC
     }
@@ -97,7 +97,7 @@ extension CSDataStack {
             sectionBy: nil,
             applyFetchClauses: { (fetchRequest) in
                 
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
             },
             createAsynchronously: {
                 
@@ -131,7 +131,7 @@ extension CSDataStack {
             sectionBy: sectionBy.bridgeToSwift,
             applyFetchClauses: { (fetchRequest) in
                 
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
             }
         ).bridgeToObjectiveC
     }
@@ -160,7 +160,7 @@ extension CSDataStack {
             sectionBy: sectionBy.bridgeToSwift,
             applyFetchClauses: { (fetchRequest) in
                 
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
             },
             createAsynchronously: {
                 

Sources/CSListMonitor.swift

@@ -503,7 +503,7 @@ public final class CSListMonitor: NSObject {
         
         self.bridgeToSwift.refetch { (fetchRequest) in
             
-            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
         }
     }
     

Sources/CoreStoreFetchRequest.swift

@@ -0,0 +1,91 @@
+//
+//  CoreStoreFetchRequest.swift
+//  CoreStore
+//
+//  Copyright © 2019 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+import ObjectiveC
+
+
+// MARK: - CoreStoreFetchRequest
+
+// Bugfix for NSFetchRequest messing up memory management for `affectedStores`
+// http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified
+internal final class CoreStoreFetchRequest<T: NSFetchRequestResult>: NSFetchRequest<NSFetchRequestResult> {
+
+    @nonobjc
+    internal func safeAffectedStores() -> [NSPersistentStore]? {
+
+        return self.copiedAffectedStores as! [NSPersistentStore]?
+    }
+
+    @nonobjc @inline(__always)
+    internal func staticCast() -> NSFetchRequest<T> {
+
+        return unsafeBitCast(self, to: NSFetchRequest<T>.self)
+    }
+
+    @nonobjc @inline(__always)
+    internal func dynamicCast<U>() -> NSFetchRequest<U> {
+
+        return unsafeBitCast(self, to: NSFetchRequest<U>.self)
+    }
+
+
+    // MARK: NSFetchRequest
+
+    @objc dynamic
+    override var affectedStores: [NSPersistentStore]? {
+
+        get {
+
+            return super.affectedStores
+        }
+        set {
+
+            if #available(iOS 11.0, macOS 10.13, watchOS 4.0, tvOS 11.0) {
+
+                self.copiedAffectedStores = (newValue as NSArray?)?.copy() as! NSArray?
+                super.affectedStores = newValue
+                return
+            }
+            // Bugfix for NSFetchRequest messing up memory management for `affectedStores`
+            // http://stackoverflow.com/questions/14396375/nsfetchedresultscontroller-crashes-in-ios-6-if-affectedstores-is-specified
+            if let releaseArray = self.releaseArray {
+
+                releaseArray.release()
+                self.releaseArray = nil
+            }
+            self.copiedAffectedStores = (newValue as NSArray?)?.copy() as! NSArray?
+            super.affectedStores = newValue
+            self.releaseArray = (super.affectedStores as NSArray?).map(Unmanaged<NSArray>.passRetained(_:))
+        }
+    }
+
+
+    // MARK: Private
+
+    private var copiedAffectedStores: NSArray?
+    private var releaseArray: Unmanaged<NSArray>?
+}

Sources/CoreStoreFetchedResultsController.swift

@@ -35,7 +35,10 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
     // MARK: Internal
 
     @nonobjc
-    internal convenience init<D>(dataStack: DataStack, fetchRequest: NSFetchRequest<NSManagedObject>, from: From<D>, sectionBy: SectionBy<D>? = nil, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void) {
+    internal let typedFetchRequest: CoreStoreFetchRequest<NSManagedObject>
+    
+    @nonobjc
+    internal convenience init<D>(dataStack: DataStack, fetchRequest: CoreStoreFetchRequest<NSManagedObject>, from: From<D>, sectionBy: SectionBy<D>? = nil, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void) {
 
         self.init(
             context: dataStack.mainContext,
@@ -47,7 +50,7 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
     }
     
     @nonobjc
-    internal init<D>(context: NSManagedObjectContext, fetchRequest: NSFetchRequest<NSManagedObject>, from: From<D>, sectionBy: SectionBy<D>? = nil, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void) {
+    internal init<D>(context: NSManagedObjectContext, fetchRequest: CoreStoreFetchRequest<NSManagedObject>, from: From<D>, sectionBy: SectionBy<D>? = nil, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void) {
         
         _ = try? from.applyToFetchRequest(
             fetchRequest,
@@ -56,13 +59,14 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
         )
         applyFetchClauses(fetchRequest)
 
+        self.typedFetchRequest = fetchRequest
         self.reapplyAffectedStores = { fetchRequest, context in
             
             try from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
         }
         
         super.init(
-            fetchRequest: fetchRequest,
+            fetchRequest: fetchRequest.staticCast(),
             managedObjectContext: context,
             sectionNameKeyPath: sectionBy?.sectionKeyPath,
             cacheName: nil
@@ -72,7 +76,7 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
     @nonobjc
     internal func performFetchFromSpecifiedStores() throws {
 
-        try self.reapplyAffectedStores(self.fetchRequest, self.managedObjectContext)
+        try self.reapplyAffectedStores(self.typedFetchRequest, self.managedObjectContext)
         try self.performFetch()
     }
     
@@ -91,5 +95,5 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
     // MARK: Private
     
     @nonobjc
-    private let reapplyAffectedStores: (_ fetchRequest: NSFetchRequest<NSManagedObject>, _ context: NSManagedObjectContext) throws -> Void
+    private let reapplyAffectedStores: (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>, _ context: NSManagedObjectContext) throws -> Void
 }

Sources/From.swift

@@ -139,7 +139,7 @@ public struct From<D: DynamicObject> {
         self.findPersistentStores = findPersistentStores
     }
     
-    internal func applyToFetchRequest<U>(_ fetchRequest: NSFetchRequest<U>, context: NSManagedObjectContext, applyAffectedStores: Bool = true) throws {
+    internal func applyToFetchRequest<U>(_ fetchRequest: CoreStoreFetchRequest<U>, context: NSManagedObjectContext, applyAffectedStores: Bool = true) throws {
         
         fetchRequest.entity = context.parentStack!.entityDescription(for: EntityIdentifier(self.entityClass))!
         guard applyAffectedStores else {
@@ -164,7 +164,7 @@ public struct From<D: DynamicObject> {
         }
     }
     
-    internal func applyAffectedStoresForFetchedRequest<U>(_ fetchRequest: NSFetchRequest<U>, context: NSManagedObjectContext) throws {
+    internal func applyAffectedStoresForFetchedRequest<U>(_ fetchRequest: CoreStoreFetchRequest<U>, context: NSManagedObjectContext) throws {
         
         let stores = self.findPersistentStores(context)
         fetchRequest.affectedStores = stores

Sources/ListMonitor.swift

@@ -628,7 +628,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
     
     // MARK: Internal
     
-    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void) {
+    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void) {
         
         self.init(
             context: dataStack.mainContext,
@@ -640,7 +640,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<ObjectType>) -> Void) {
+    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<ObjectType>) -> Void) {
         
         self.init(
             context: dataStack.mainContext,
@@ -652,7 +652,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void) {
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void) {
         
         self.init(
             context: unsafeTransaction.context,
@@ -664,7 +664,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<ObjectType>) -> Void) {
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<ObjectType>) -> Void) {
         
         self.init(
             context: unsafeTransaction.context,
@@ -923,7 +923,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         cs_setAssociatedRetainedObject(nilValue, forKey: &self.didDeleteSectionKey, inObject: observer)
     }
     
-    internal func refetch(_ applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void) {
+    internal func refetch(_ applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void) {
         
         CoreStore.assert(
             Thread.isMainThread,
@@ -1022,7 +1022,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
     private var observerForWillChangePersistentStore: NotificationObserver!
     private var observerForDidChangePersistentStore: NotificationObserver!
     private let transactionQueue: DispatchQueue
-    private var applyFetchClauses: (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void
+    private var applyFetchClauses: (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void
     
     private var isPersistentStoreChanging: Bool = false {
         
@@ -1045,9 +1045,9 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         }
     }
     
-    private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void) -> (controller: CoreStoreFetchedResultsController, delegate: FetchedResultsControllerDelegate) {
+    private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void) -> (controller: CoreStoreFetchedResultsController, delegate: FetchedResultsControllerDelegate) {
         
-        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObject>()
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .managedObjectResultType
         fetchRequest.fetchBatchSize = 20
@@ -1071,7 +1071,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
     private let from: From<ObjectType>
     private let sectionBy: SectionBy<ObjectType>?
     
-    private init(context: NSManagedObjectContext, transactionQueue: DispatchQueue, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: NSFetchRequest<NSManagedObject>) -> Void, createAsynchronously: ((ListMonitor<ObjectType>) -> Void)?) {
+    private init(context: NSManagedObjectContext, transactionQueue: DispatchQueue, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: ((ListMonitor<ObjectType>) -> Void)?) {
         
         self.isSectioned = (sectionBy != nil)
         self.from = from
@@ -1114,7 +1114,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
                 self.isPersistentStoreChanging = true
                 
                 guard let removedStores = (note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore]).flatMap(Set.init),
-                    !Set(self.fetchedResultsController.fetchRequest.affectedStores ?? []).intersection(removedStores).isEmpty else {
+                    !Set(self.fetchedResultsController.typedFetchRequest.safeAffectedStores() ?? []).intersection(removedStores).isEmpty else {
                         
                         return
                 }
@@ -1135,7 +1135,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
                 
                 if !self.isPendingRefetch {
                     
-                    let previousStores = Set(self.fetchedResultsController.fetchRequest.affectedStores ?? [])
+                    let previousStores = Set(self.fetchedResultsController.typedFetchRequest.safeAffectedStores() ?? [])
                     let currentStores = previousStores
                         .subtracting(note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore] ?? [])
                         .union(note.userInfo?[NSAddedPersistentStoresKey] as? [NSPersistentStore] ?? [])

Sources/NSFetchedResultsController+Convenience.swift

@@ -205,12 +205,12 @@ fileprivate func createFRC<D: NSManagedObject>(fromContext context: NSManagedObj
     
     let controller = CoreStoreFetchedResultsController(
         context: context,
-        fetchRequest: NSFetchRequest<NSManagedObject>(),
+        fetchRequest: CoreStoreFetchRequest(),
         from: from,
         sectionBy: sectionBy,
         applyFetchClauses: { (fetchRequest) in
             
-            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
             
             CoreStore.assert(
                 fetchRequest.sortDescriptors?.isEmpty == false,

Sources/NSFetchedResultsController+ObjectiveC.swift

@@ -72,12 +72,12 @@ fileprivate func createFRC(fromContext context: NSManagedObjectContext, from: CS
     
     let controller = CoreStoreFetchedResultsController(
         context: context,
-        fetchRequest: NSFetchRequest<NSManagedObject>(),
+        fetchRequest: CoreStoreFetchRequest(),
         from: from.bridgeToSwift,
         sectionBy: sectionBy?.bridgeToSwift,
         applyFetchClauses: { (fetchRequest) in
             
-            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
             
             CoreStore.assert(
                 fetchRequest.sortDescriptors?.isEmpty == false,

Sources/NSManagedObjectContext+ObjectiveC.swift

@@ -36,12 +36,12 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func fetchOne(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> NSManagedObject? {
         
-        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObject>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 1
         fetchRequest.resultType = .managedObjectResultType
-        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.fetchOne(fetchRequest)
     }
@@ -49,12 +49,12 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func fetchAll<T: NSManagedObject>(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> [T] {
         
-        let fetchRequest = NSFetchRequest<T>()
+        let fetchRequest = CoreStoreFetchRequest<T>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .managedObjectResultType
-        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.fetchAll(fetchRequest)
     }
@@ -62,11 +62,11 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func fetchCount(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> Int {
         
-        let fetchRequest = NSFetchRequest<NSNumber>()
+        let fetchRequest = CoreStoreFetchRequest<NSNumber>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
 
         fetchRequest.resultType = .countResultType
-        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.fetchCount(fetchRequest)
     }
@@ -74,12 +74,12 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func fetchObjectID(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> NSManagedObjectID? {
         
-        let fetchRequest = NSFetchRequest<NSManagedObjectID>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObjectID>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 1
         fetchRequest.resultType = .managedObjectIDResultType
-        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.fetchObjectID(fetchRequest)
     }
@@ -87,12 +87,12 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func fetchObjectIDs(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> [NSManagedObjectID] {
         
-        let fetchRequest = NSFetchRequest<NSManagedObjectID>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObjectID>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .managedObjectIDResultType
-        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.fetchObjectIDs(fetchRequest)
     }
@@ -100,14 +100,14 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func deleteAll(_ from: CSFrom, _ deleteClauses: [CSDeleteClause]) throws -> Int {
         
-        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObject>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .managedObjectResultType
         fetchRequest.returnsObjectsAsFaults = true
         fetchRequest.includesPropertyValues = false
-        deleteClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        deleteClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.deleteAll(fetchRequest)
     }
@@ -115,13 +115,13 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func queryValue(_ from: CSFrom, _ selectClause: CSSelect, _ queryClauses: [CSQueryClause]) throws -> Any? {
         
-        let fetchRequest = NSFetchRequest<NSDictionary>()
+        let fetchRequest = CoreStoreFetchRequest<NSDictionary>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
         
-        selectClause.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>)
+        selectClause.applyToFetchRequest(fetchRequest)
-        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.queryValue(selectClause.selectTerms, fetchRequest: fetchRequest)
     }
@@ -129,13 +129,13 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func queryAttributes(_ from: CSFrom, _ selectClause: CSSelect, _ queryClauses: [CSQueryClause]) throws -> [[String: Any]] {
         
-        let fetchRequest = NSFetchRequest<NSDictionary>()
+        let fetchRequest = CoreStoreFetchRequest<NSDictionary>()
         try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
         
-        selectClause.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>)
+        selectClause.applyToFetchRequest(fetchRequest)
-        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.queryAttributes(fetchRequest)
     }

Sources/NSManagedObjectContext+Querying.swift

@@ -109,7 +109,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     public func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
         
-        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObject>()
         try from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 1
@@ -134,7 +134,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     public func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
         
-        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObject>()
         try from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
@@ -160,7 +160,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     public func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
         
-        let fetchRequest = NSFetchRequest<NSNumber>()
+        let fetchRequest = CoreStoreFetchRequest<NSNumber>()
         try from.applyToFetchRequest(fetchRequest, context: self)
 
         fetchRequest.resultType = .countResultType
@@ -184,7 +184,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
         
-        let fetchRequest = NSFetchRequest<NSManagedObjectID>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObjectID>()
         try from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 1
@@ -209,7 +209,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
 
-        let fetchRequest = NSFetchRequest<NSManagedObjectID>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObjectID>()
         try from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
@@ -226,7 +226,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    internal func fetchObjectIDs(_ fetchRequest: NSFetchRequest<NSManagedObjectID>) throws -> [NSManagedObjectID] {
+    internal func fetchObjectIDs(_ fetchRequest: CoreStoreFetchRequest<NSManagedObjectID>) throws -> [NSManagedObjectID] {
         
         var fetchResults: [NSManagedObjectID]?
         var fetchError: Error?
@@ -234,7 +234,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
             
             do {
                 
-                fetchResults = try self.fetch(fetchRequest)
+                fetchResults = try self.fetch(fetchRequest.dynamicCast())
             }
             catch {
                 
@@ -265,12 +265,12 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
         
-        let fetchRequest = NSFetchRequest<NSDictionary>()
+        let fetchRequest = CoreStoreFetchRequest<NSDictionary>()
         try from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
         
-        selectClause.applyToFetchRequest(fetchRequest)
+        selectClause.applyToFetchRequest(fetchRequest.staticCast())
         queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.queryValue(selectClause.selectTerms, fetchRequest: fetchRequest)
@@ -291,12 +291,12 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
         
-        let fetchRequest = NSFetchRequest<NSDictionary>()
+        let fetchRequest = CoreStoreFetchRequest<NSDictionary>()
         try from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
         
-        selectClause.applyToFetchRequest(fetchRequest)
+        selectClause.applyToFetchRequest(fetchRequest.staticCast())
         queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
 
         return try self.queryAttributes(fetchRequest)
@@ -322,7 +322,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     @nonobjc
     internal func deleteAll<D>(_ from: From<D>, _ deleteClauses: [FetchClause]) throws -> Int {
         
-        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObject>()
         try from.applyToFetchRequest(fetchRequest, context: self)
         
         fetchRequest.fetchLimit = 0
@@ -352,7 +352,7 @@ extension NSManagedObjectContext {
     // MARK: Fetching
     
     @nonobjc
-    internal func fetchOne<D: NSManagedObject>(_ fetchRequest: NSFetchRequest<D>) throws -> D? {
+    internal func fetchOne<D: NSManagedObject>(_ fetchRequest: CoreStoreFetchRequest<D>) throws -> D? {
         
         var fetchResults: [D]?
         var fetchError: Error?
@@ -360,7 +360,7 @@ extension NSManagedObjectContext {
             
             do {
                 
-                fetchResults = try self.fetch(fetchRequest)
+                fetchResults = try self.fetch(fetchRequest.staticCast())
             }
             catch {
                 
@@ -380,7 +380,7 @@ extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal func fetchAll<D: NSManagedObject>(_ fetchRequest: NSFetchRequest<D>) throws -> [D] {
+    internal func fetchAll<D: NSManagedObject>(_ fetchRequest: CoreStoreFetchRequest<D>) throws -> [D] {
         
         var fetchResults: [D]?
         var fetchError: Error?
@@ -388,7 +388,7 @@ extension NSManagedObjectContext {
             
             do {
                 
-                fetchResults = try self.fetch(fetchRequest)
+                fetchResults = try self.fetch(fetchRequest.staticCast())
             }
             catch {
                 
@@ -408,7 +408,7 @@ extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal func fetchCount(_ fetchRequest: NSFetchRequest<NSNumber>) throws -> Int {
+    internal func fetchCount(_ fetchRequest: CoreStoreFetchRequest<NSNumber>) throws -> Int {
         
         var count = 0
         var countError: Error?
@@ -416,7 +416,7 @@ extension NSManagedObjectContext {
             
             do {
                 
-                count = try self.count(for: fetchRequest)
+                count = try self.count(for: fetchRequest.staticCast())
             }
             catch {
                 
@@ -436,7 +436,7 @@ extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal func fetchObjectID(_ fetchRequest: NSFetchRequest<NSManagedObjectID>) throws -> NSManagedObjectID? {
+    internal func fetchObjectID(_ fetchRequest: CoreStoreFetchRequest<NSManagedObjectID>) throws -> NSManagedObjectID? {
         
         var fetchResults: [NSManagedObjectID]?
         var fetchError: Error?
@@ -444,7 +444,7 @@ extension NSManagedObjectContext {
             
             do {
                 
-                fetchResults = try self.fetch(fetchRequest)
+                fetchResults = try self.fetch(fetchRequest.staticCast())
             }
             catch {
                 
@@ -467,7 +467,7 @@ extension NSManagedObjectContext {
     // MARK: Querying
     
     @nonobjc
-    internal func queryValue<D, U: QueryableAttributeType>(_ selectTerms: [SelectTerm<D>], fetchRequest: NSFetchRequest<NSDictionary>) throws -> U? {
+    internal func queryValue<D, U: QueryableAttributeType>(_ selectTerms: [SelectTerm<D>], fetchRequest: CoreStoreFetchRequest<NSDictionary>) throws -> U? {
         
         var fetchResults: [Any]?
         var fetchError: Error?
@@ -475,7 +475,7 @@ extension NSManagedObjectContext {
             
             do {
                 
-                fetchResults = try self.fetch(fetchRequest)
+                fetchResults = try self.fetch(fetchRequest.staticCast())
             }
             catch {
                 
@@ -500,7 +500,7 @@ extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal func queryValue<D>(_ selectTerms: [SelectTerm<D>], fetchRequest: NSFetchRequest<NSDictionary>) throws -> Any? {
+    internal func queryValue<D>(_ selectTerms: [SelectTerm<D>], fetchRequest: CoreStoreFetchRequest<NSDictionary>) throws -> Any? {
         
         var fetchResults: [Any]?
         var fetchError: Error?
@@ -508,7 +508,7 @@ extension NSManagedObjectContext {
             
             do {
                 
-                fetchResults = try self.fetch(fetchRequest)
+                fetchResults = try self.fetch(fetchRequest.staticCast())
             }
             catch {
                 
@@ -533,7 +533,7 @@ extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal func queryAttributes(_ fetchRequest: NSFetchRequest<NSDictionary>) throws -> [[String: Any]] {
+    internal func queryAttributes(_ fetchRequest: CoreStoreFetchRequest<NSDictionary>) throws -> [[String: Any]] {
         
         var fetchResults: [Any]?
         var fetchError: Error?
@@ -541,7 +541,7 @@ extension NSManagedObjectContext {
             
             do {
                 
-                fetchResults = try self.fetch(fetchRequest)
+                fetchResults = try self.fetch(fetchRequest.staticCast())
             }
             catch {
                 
@@ -564,7 +564,7 @@ extension NSManagedObjectContext {
     // MARK: Deleting
     
     @nonobjc
-    internal func deleteAll<D: NSManagedObject>(_ fetchRequest: NSFetchRequest<D>) throws -> Int {
+    internal func deleteAll<D: NSManagedObject>(_ fetchRequest: CoreStoreFetchRequest<D>) throws -> Int {
         
         var numberOfDeletedObjects: Int?
         var fetchError: Error?
@@ -574,7 +574,7 @@ extension NSManagedObjectContext {
                 
                 do {
                     
-                    let fetchResults = try self.fetch(fetchRequest)
+                    let fetchResults = try self.fetch(fetchRequest.staticCast())
                     for object in fetchResults {
                         
                         self.delete(object)

Sources/ObjectMonitor.swift

@@ -261,7 +261,7 @@ public final class ObjectMonitor<D: DynamicObject>: Equatable {
     private init(context: NSManagedObjectContext, object: ObjectType) {
         
         let objectID = object.cs_id()
-        let fetchRequest = NSFetchRequest<NSManagedObject>()
+        let fetchRequest = CoreStoreFetchRequest<NSManagedObject>()
         fetchRequest.entity = objectID.entity
         fetchRequest.fetchLimit = 0
         fetchRequest.resultType = .managedObjectResultType