WIP: Fetching unit tests

2026-01-16 14:06:53 +01:00 · 2016-06-06 00:12:00 +09:00
parent 02a89accc8
commit b98805e489
13 changed files with 1842 additions and 74 deletions
--- a/Clauses/From.swift
+++ b/Clauses/From.swift
@@ -181,13 +181,23 @@ public struct From<T: NSManagedObject> {
    internal let entityClass: AnyClass
    internal let dumpInfo: (key: String, value: Any)?
    
-    internal func applyToFetchRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext, applyAffectedStores: Bool = true) {
+    @warn_unused_result
+    internal func applyToFetchRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext, applyAffectedStores: Bool = true) -> Bool {
        
        fetchRequest.entity = context.entityDescriptionForEntityClass(self.entityClass)
-        if applyAffectedStores {
+        guard applyAffectedStores else {
            
-            self.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
+            return true
        }
+        if self.applyAffectedStoresForFetchedRequest(fetchRequest, context: context) {
+            
+            return true
+        }
+        CoreStore.log(
+            .Warning,
+            message: "Attempted to perform a fetch but could not find any persistent store for the entity \(cs_typeName(fetchRequest.entityName))"
+        )
+        return false
    }
    
    internal func applyAffectedStoresForFetchedRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool {
--- a/Sources/Internal/CoreStoreFetchedResultsController.swift
+++ b/Sources/Internal/CoreStoreFetchedResultsController.swift
@@ -49,7 +49,11 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
    @nonobjc
    internal init<T: NSManagedObject>(context: NSManagedObjectContext, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, applyFetchClauses: (fetchRequest: NSFetchRequest) -> Void) {
        
-        from?.applyToFetchRequest(fetchRequest, context: context, applyAffectedStores: false)
+        _ = from?.applyToFetchRequest(
+            fetchRequest,
+            context: context,
+            applyAffectedStores: false
+        )
        applyFetchClauses(fetchRequest: fetchRequest)
        
        CoreStore.assert(
--- a/Sources/Internal/NSManagedObjectContext+Querying.swift
+++ b/Sources/Internal/NSManagedObjectContext+Querying.swift
@@ -83,12 +83,16 @@ internal extension NSManagedObjectContext {
    internal func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 1
        fetchRequest.resultType = .ManagedObjectResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchOne(fetchRequest)
    }
    
@@ -133,12 +137,16 @@ internal extension NSManagedObjectContext {
    internal func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchAll(fetchRequest)
    }
    
@@ -183,9 +191,13 @@ internal extension NSManagedObjectContext {
    internal func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchCount(fetchRequest)
    }
    
@@ -223,12 +235,16 @@ internal extension NSManagedObjectContext {
    internal func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 1
        fetchRequest.resultType = .ManagedObjectIDResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchObjectID(fetchRequest)
    }
    
@@ -273,12 +289,16 @@ internal extension NSManagedObjectContext {
    internal func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectIDResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchObjectIDs(fetchRequest)
    }
    
@@ -323,7 +343,7 @@ internal extension NSManagedObjectContext {
    internal func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: [DeleteClause]) -> Int? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectResultType
@@ -331,6 +351,10 @@ internal extension NSManagedObjectContext {
        fetchRequest.includesPropertyValues = false
        deleteClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.deleteAll(fetchRequest)
    }
    
@@ -383,7 +407,7 @@ internal extension NSManagedObjectContext {
    internal func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        
@@ -391,6 +415,10 @@ internal extension NSManagedObjectContext {
        selectTerms.applyToFetchRequest(fetchRequest, owner: selectClause)
        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.queryValue(selectTerms, fetchRequest: fetchRequest)
    }
    
@@ -473,13 +501,17 @@ internal extension NSManagedObjectContext {
    internal func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        
        selectClause.selectTerms.applyToFetchRequest(fetchRequest, owner: selectClause)
        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.queryAttributes(fetchRequest)
    }
    
--- a/Sources/ObjectiveC/CSFrom.swift
+++ b/Sources/ObjectiveC/CSFrom.swift
@@ -84,32 +84,6 @@ public final class CSFrom: NSObject, CoreStoreObjectiveCType {
        return self.init(From(entityClass, configurations.map { $0 is NSNull ? nil : ($0 as! String) }))
    }
    
-    /**
-     Initializes a `CSFrom` clause with the specified store URLs.
-     
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter storeURLs: the persistent store URLs to associate objects from.
-     - returns: a `CSFrom` clause with the specified store URLs
-     */
-    @objc
-    public static func entityClass(entityClass: AnyClass, storeURLs: [NSURL]) -> CSFrom {
-        
-        return self.init(From(entityClass, storeURLs))
-    }
-    
-    /**
-     Initializes a `CSFrom` clause with the specified `NSPersistentStore`s.
-     
-     - parameter entity: the associated `NSManagedObject` entity class
-     - parameter persistentStores: the `NSPersistentStore`s to associate objects from.
-     - returns: a `CSFrom` clause with the specified `NSPersistentStore`s
-     */
-    @objc
-    public static func entityClass(entityClass: AnyClass, persistentStores: [NSPersistentStore]) -> CSFrom {
-        
-        return self.init(From(entityClass, persistentStores))
-    }
-    
    
    // MARK: NSObject
    
--- a/Sources/ObjectiveC/NSManagedObjectContext+ObjectiveC.swift
+++ b/Sources/ObjectiveC/NSManagedObjectContext+ObjectiveC.swift
@@ -37,12 +37,16 @@ internal extension NSManagedObjectContext {
    internal func fetchOne(from: CSFrom, _ fetchClauses: [CSFetchClause]) -> NSManagedObject? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 1
        fetchRequest.resultType = .ManagedObjectResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchOne(fetchRequest)
    }
    
@@ -50,12 +54,16 @@ internal extension NSManagedObjectContext {
    internal func fetchAll(from: CSFrom, _ fetchClauses: [CSFetchClause]) -> [NSManagedObject]? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchAll(fetchRequest)
    }
    
@@ -63,9 +71,13 @@ internal extension NSManagedObjectContext {
    internal func fetchCount(from: CSFrom, _ fetchClauses: [CSFetchClause]) -> Int? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchCount(fetchRequest)
    }
    
@@ -73,12 +85,16 @@ internal extension NSManagedObjectContext {
    internal func fetchObjectID(from: CSFrom, _ fetchClauses: [CSFetchClause]) -> NSManagedObjectID? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 1
        fetchRequest.resultType = .ManagedObjectIDResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchObjectID(fetchRequest)
    }
    
@@ -86,12 +102,16 @@ internal extension NSManagedObjectContext {
    internal func fetchObjectIDs(from: CSFrom, _ fetchClauses: [CSFetchClause]) -> [NSManagedObjectID]? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectIDResultType
        fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.fetchObjectIDs(fetchRequest)
    }
    
@@ -99,7 +119,7 @@ internal extension NSManagedObjectContext {
    internal func deleteAll(from: CSFrom, _ deleteClauses: [CSDeleteClause]) -> Int? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectResultType
@@ -107,6 +127,10 @@ internal extension NSManagedObjectContext {
        fetchRequest.includesPropertyValues = false
        deleteClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.deleteAll(fetchRequest)
    }
    
@@ -114,7 +138,7 @@ internal extension NSManagedObjectContext {
    internal func queryValue(from: CSFrom, _ selectClause: CSSelect, _ queryClauses: [CSQueryClause]) -> AnyObject? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        
@@ -122,6 +146,10 @@ internal extension NSManagedObjectContext {
        selectTerms.applyToFetchRequest(fetchRequest, owner: selectClause)
        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.queryValue(selectTerms, fetchRequest: fetchRequest)
    }
    
@@ -129,13 +157,17 @@ internal extension NSManagedObjectContext {
    internal func queryAttributes(from: CSFrom, _ selectClause: CSSelect, _ queryClauses: [CSQueryClause]) -> [[NSString: AnyObject]]? {
        
        let fetchRequest = CoreStoreFetchRequest()
-        from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
+        let storeFound = from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self)
        
        fetchRequest.fetchLimit = 0
        
        selectClause.selectTerms.applyToFetchRequest(fetchRequest, owner: selectClause)
        queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        
+        guard storeFound else {
+            
+            return nil
+        }
        return self.queryAttributes(fetchRequest)
    }
 }
--- a/Sources/Transactions/BaseDataTransaction.swift
+++ b/Sources/Transactions/BaseDataTransaction.swift
@@ -64,7 +64,11 @@ public /*abstract*/ class BaseDataTransaction {
        let entityClass = (into.entityClass as! NSManagedObject.Type)
        if into.inferStoreIfPossible {
            
-            switch context.parentStack!.persistentStoreForEntityClass(entityClass, configuration: nil, inferStoreIfPossible: true) {
+            switch context.parentStack!.persistentStoreForEntityClass(
+                entityClass,
+                configuration: nil,
+                inferStoreIfPossible: true
+            ) {
                
            case (let persistentStore?, _):
                let object = entityClass.createInContext(context) as! T
@@ -80,13 +84,21 @@ public /*abstract*/ class BaseDataTransaction {
        }
        else {
            
-            switch context.parentStack!.persistentStoreForEntityClass(entityClass, configuration: into.configuration, inferStoreIfPossible: false) {
+            switch context.parentStack!.persistentStoreForEntityClass(
+                entityClass,
+                configuration: into.configuration
+                    ?? into.dynamicType.defaultConfigurationName,
+                inferStoreIfPossible: false
+            ) {
                
            case (let persistentStore?, _):
                let object = entityClass.createInContext(context) as! T
                context.assignObject(object, toPersistentStore: persistentStore)
                return object
                
+            case (nil, true):
+                fatalError("Attempted to create an entity of type \(cs_typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
+                
            default:
                if let configuration = into.configuration {