WIP: objective-C fetching

Sources/Fetching and Querying/BaseDataTransaction+Querying.swift

@@ -103,12 +103,7 @@ public extension BaseDataTransaction {
     @warn_unused_result
     public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
         
-        CoreStore.assert(
-            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
-        )
-        
-        return self.context.fetchOne(from, fetchClauses)
+        return self.fetchOne(from, fetchClauses)
     }
     
     /**
@@ -125,7 +120,6 @@ public extension BaseDataTransaction {
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchOne(from, fetchClauses)
     }
     
@@ -139,12 +133,7 @@ public extension BaseDataTransaction {
     @warn_unused_result
     public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
         
-        CoreStore.assert(
-            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
-        )
-        
-        return self.context.fetchAll(from, fetchClauses)
+        return self.fetchAll(from, fetchClauses)
     }
     
     /**
@@ -161,7 +150,6 @@ public extension BaseDataTransaction {
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchAll(from, fetchClauses)
     }
     
@@ -175,12 +163,7 @@ public extension BaseDataTransaction {
     @warn_unused_result
     public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
         
-        CoreStore.assert(
-            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
-        )
-        
-        return self.context.fetchCount(from, fetchClauses)
+        return self.fetchCount(from, fetchClauses)
     }
     
     /**
@@ -211,12 +194,7 @@ public extension BaseDataTransaction {
     @warn_unused_result
     public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
         
-        CoreStore.assert(
-            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
-        )
-        
-        return self.context.fetchObjectID(from, fetchClauses)
+        return self.fetchObjectID(from, fetchClauses)
     }
     
     /**
@@ -233,7 +211,6 @@ public extension BaseDataTransaction {
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchObjectID(from, fetchClauses)
     }
     
@@ -247,12 +224,7 @@ public extension BaseDataTransaction {
     @warn_unused_result
     public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
         
-        CoreStore.assert(
-            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
-        )
-        
-        return self.context.fetchObjectIDs(from, fetchClauses)
+        return self.fetchObjectIDs(from, fetchClauses)
     }
     
     /**
@@ -269,7 +241,6 @@ public extension BaseDataTransaction {
             self.isRunningInAllowedQueue(),
             "Attempted to fetch from a \(typeName(self)) outside its designated queue."
         )
-        
         return self.context.fetchObjectIDs(from, fetchClauses)
     }
     

Sources/Fetching and Querying/Concrete Clauses/From.swift

@@ -39,7 +39,7 @@ import CoreData
  let person = transaction.fetchOne(From<MyPersonEntity>("Configuration1"))
  ```
  */
-public struct From<T: NSManagedObject> {
+public struct From<T: NSManagedObject>: Hashable {
     
     /**
      Initializes a `From` clause.
@@ -299,8 +299,20 @@ public struct From<T: NSManagedObject> {
     }
     
     
+    // MARK: Hashable
+    
+    public var hashValue: Int {
+        
+        return ObjectIdentifier(self.entityClass).hashValue
+    }
+    
+    
     // MARK: Internal
     
+    internal let entityClass: AnyClass
+    
+    internal let findPersistentStores: (context: NSManagedObjectContext) -> [NSPersistentStore]?
+    
     internal func applyToFetchRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext, applyAffectedStores: Bool = true) {
         
         fetchRequest.entity = context.entityDescriptionForEntityClass(self.entityClass)
@@ -317,58 +329,77 @@ public struct From<T: NSManagedObject> {
         return stores?.isEmpty == false
     }
     
+    internal init(entityClass: AnyClass, findPersistentStores: (context: NSManagedObjectContext) -> [NSPersistentStore]?) {
+        
+        self.entityClass = entityClass
+        self.findPersistentStores = findPersistentStores
+    }
+    
     
     // MARK: Private
     
-    private let entityClass: AnyClass
-    
-    private let findPersistentStores: (context: NSManagedObjectContext) -> [NSPersistentStore]?
-    
     private init(entityClass: AnyClass) {
         
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)
-        }
+        self.init(
+            entityClass: entityClass,
+            findPersistentStores: { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
+                
+                return context.parentStack?.persistentStoresForEntityClass(entityClass)
+            }
+        )
     }
     
     private init(entityClass: AnyClass, configurations: [String?]) {
         
         let configurationsSet = Set(configurations.map { $0 ?? Into.defaultConfigurationName })
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
+        self.init(
+            entityClass: entityClass,
+            findPersistentStores: { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
                 
-                return configurationsSet.contains($0.configurationName)
+                return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
+                    
+                    return configurationsSet.contains($0.configurationName)
+                }
             }
-        }
+        )
     }
     
     private init(entityClass: AnyClass, storeURLs: [NSURL]) {
         
         let storeURLsSet = Set(storeURLs)
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
+        self.init(
+            entityClass: entityClass,
+            findPersistentStores: { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
                 
-                return $0.URL != nil && storeURLsSet.contains($0.URL!)
+                return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
+                    
+                    return $0.URL != nil && storeURLsSet.contains($0.URL!)
+                }
             }
-        }
+        )
     }
     
     private init(entityClass: AnyClass, persistentStores: [NSPersistentStore]) {
         
         let persistentStores = Set(persistentStores)
-        self.entityClass = entityClass
-        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
-            
-            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
+        self.init(
+            entityClass: entityClass,
+            findPersistentStores: { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
                 
-                return persistentStores.contains($0)
+                return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
+                    
+                    return persistentStores.contains($0)
+                }
             }
-        }
+        )
     }
 }
+
+
+// MARK: - From: Equatable
+
+@warn_unused_result
+public func == <T: NSManagedObject, U: NSManagedObject>(lhs: From<T>, rhs: From<U>) -> Bool {
+    
+    return lhs.entityClass == rhs.entityClass
+}

Sources/Fetching and Querying/Concrete Clauses/GroupBy.swift

@@ -32,7 +32,7 @@ import CoreData
 /**
  The `GroupBy` clause specifies that the result of a query be grouped accoording to the specified key path.
  */
-public struct GroupBy: QueryClause {
+public struct GroupBy: QueryClause, Hashable {
     
     /**
      Initializes a `GroupBy` clause with a list of key path strings
@@ -80,4 +80,21 @@ public struct GroupBy: QueryClause {
         
         fetchRequest.propertiesToGroupBy = self.keyPaths
     }
+    
+    
+    // MARK: Hashable
+    
+    public var hashValue: Int {
+        
+        return (self.keyPaths as NSArray).hashValue
+    }
+}
+
+
+// MARK: - GroupBy: Equatable
+
+@warn_unused_result
+public func == (lhs: GroupBy, rhs: GroupBy) -> Bool {
+    
+    return lhs.keyPaths == rhs.keyPaths
 }

Sources/Fetching and Querying/Concrete Clauses/OrderBy.swift

@@ -67,7 +67,7 @@ public enum SortKey {
 /**
  The `OrderBy` clause specifies the sort order for results for a fetch or a query.
  */
-public struct OrderBy: FetchClause, QueryClause, DeleteClause {
+public struct OrderBy: FetchClause, QueryClause, DeleteClause, Hashable {
     
     /**
      Initializes a `OrderBy` clause with a list of sort descriptors
@@ -147,4 +147,21 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
         
         fetchRequest.sortDescriptors = self.sortDescriptors
     }
+    
+    
+    // MARK: Hashable
+    
+    public var hashValue: Int {
+        
+        return (self.sortDescriptors as NSArray).hashValue
+    }
+}
+
+
+// MARK: - OrderBy: Equatable
+
+@warn_unused_result
+public func == (lhs: OrderBy, rhs: OrderBy) -> Bool {
+    
+    return lhs.sortDescriptors == rhs.sortDescriptors
 }

Sources/Fetching and Querying/Concrete Clauses/Where.swift

@@ -48,7 +48,7 @@ public prefix func !(clause: Where) -> Where {
 /**
  The `Where` clause specifies the conditions for a fetch or a query.
  */
-public struct Where: FetchClause, QueryClause, DeleteClause {
+public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
     
     /**
      Initializes a `Where` clause with an `NSPredicate`
@@ -152,4 +152,21 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
         
         fetchRequest.predicate = self.predicate
     }
+    
+    
+    // MARK: Hashable
+    
+    public var hashValue: Int {
+        
+        return self.predicate.hashValue
+    }
+}
+
+
+// MARK: - Where: Equatable
+
+@warn_unused_result
+public func == (lhs: Where, rhs: Where) -> Bool {
+    
+    return lhs.predicate == rhs.predicate
 }

Sources/Fetching and Querying/DataStack+Querying.swift

@@ -110,7 +110,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchOne(from, fetchClauses)
     }
     
@@ -128,7 +127,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchOne(from, fetchClauses)
     }
     
@@ -146,7 +144,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchAll(from, fetchClauses)
     }
     
@@ -164,7 +161,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchAll(from, fetchClauses)
     }
     
@@ -182,7 +178,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchCount(from, fetchClauses)
     }
     
@@ -200,7 +195,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchCount(from, fetchClauses)
     }
     
@@ -218,7 +212,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchObjectID(from, fetchClauses)
     }
     
@@ -236,7 +229,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchObjectID(from, fetchClauses)
     }
     
@@ -254,7 +246,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchObjectIDs(from, fetchClauses)
     }
     
@@ -272,7 +263,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to fetch from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.fetchObjectIDs(from, fetchClauses)
     }
     
@@ -293,7 +283,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to query from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.queryValue(from, selectClause, queryClauses)
     }
     
@@ -314,7 +303,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to query from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.queryValue(from, selectClause, queryClauses)
     }
     
@@ -335,7 +323,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to query from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.queryAttributes(from, selectClause, queryClauses)
     }
     
@@ -356,7 +343,6 @@ public extension DataStack {
             NSThread.isMainThread(),
             "Attempted to query from a \(typeName(self)) outside the main thread."
         )
-        
         return self.mainContext.queryAttributes(from, selectClause, queryClauses)
     }
 }