CDQI v5

Author: Revolucent

CoreDataQueryInterface/Query.swift

@@ -50,40 +50,40 @@ public struct Query<M: NSManagedObject, R: NSFetchRequestResult> where M: Entity
     public func select<P: Sequence>(_ properties: P) -> Query<M, NSDictionary> where P.Iterator.Element: PropertyConvertible {
         var builder = self.builder
         builder.resultType = .dictionaryResultType
-        builder.properties ??= []
-        builder.properties!.append(contentsOf: properties.map{ $0.cdqiProperty })
+        builder.propertiesToFetch ??= []
+        builder.propertiesToFetch!.append(contentsOf: properties.map{ $0.cdqiProperty })
         return Query<M, NSDictionary>(builder: builder)
     }
 
     public func select(_ properties: PropertyConvertible...) -> Query<M, NSDictionary> {
         var builder = self.builder
         builder.resultType = .dictionaryResultType
-        builder.properties ??= []
-        builder.properties!.append(contentsOf: properties.map{ $0.cdqiProperty })
+        builder.propertiesToFetch ??= []
+        builder.propertiesToFetch!.append(contentsOf: properties.map{ $0.cdqiProperty })
         return Query<M, NSDictionary>(builder: builder)
     }
 
     public func select(_ blocks: ((M.CDQIAttribute) -> PropertyConvertible)...) -> Query<M, NSDictionary> {
         var builder = self.builder
         builder.resultType = .dictionaryResultType
-        builder.properties ??= []
+        builder.propertiesToFetch ??= []
         let attribute = M.CDQIAttribute()
-        builder.properties!.append(contentsOf: blocks.map{ $0(attribute).cdqiProperty })
+        builder.propertiesToFetch!.append(contentsOf: blocks.map{ $0(attribute).cdqiProperty })
         return Query<M, NSDictionary>(builder: builder)
     }
 
     public func select(_ block: (M.CDQIAttribute) -> [PropertyConvertible]) -> Query<M, NSDictionary> {
         var builder = self.builder
         builder.resultType = .dictionaryResultType
-        builder.properties ??= []
-        builder.properties!.append(contentsOf: block(M.CDQIAttribute()).map{ $0.cdqiProperty })
+        builder.propertiesToFetch ??= []
+        builder.propertiesToFetch!.append(contentsOf: block(M.CDQIAttribute()).map{ $0.cdqiProperty })
         return Query<M, NSDictionary>(builder: builder)
     }
 
     public func reselect() -> Query<M, NSDictionary> {
         var builder = self.builder
         builder.resultType = .dictionaryResultType
-        builder.properties = nil
+        builder.propertiesToFetch = nil
         return Query<M, NSDictionary>(builder: builder)
     }
 
@@ -170,15 +170,15 @@ public struct Query<M: NSManagedObject, R: NSFetchRequestResult> where M: Entity
 
     public func objects() -> Query<M, M> {
         var builder = self.builder
-        builder.properties = nil
+        builder.propertiesToFetch = nil
         builder.propertiesToGroupBy = nil
         builder.resultType = .managedObjectResultType
         return Query<M, M>(builder: builder)
     }
 
     public func ids() -> Query<M, NSManagedObjectID> {
         var builder = self.builder
-        builder.properties = nil
+        builder.propertiesToFetch = nil
         builder.propertiesToGroupBy = nil        
         builder.resultType = .managedObjectIDResultType
         return Query<M, NSManagedObjectID>(builder: builder)

CoreDataQueryInterface/QueryBuilder.swift

@@ -14,7 +14,7 @@ public struct QueryBuilder<M: NSManagedObject> {
     public var fetchLimit: Int = 0
     public var fetchOffset: Int = 0
     public var predicates = [NSPredicate]()
-    public var properties: [Any]?
+    public var propertiesToFetch: [Any]?
     public var propertiesToGroupBy: [Any]?
     public var resultType: NSFetchRequestResultType = .managedObjectResultType
     public var sortDescriptors = [NSSortDescriptor]()
@@ -29,10 +29,9 @@ public struct QueryBuilder<M: NSManagedObject> {
         request.fetchOffset = fetchOffset
         request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: predicates)
         request.sortDescriptors = sortDescriptors
-        request.propertiesToFetch = properties
+        request.propertiesToFetch = propertiesToFetch
         request.propertiesToGroupBy = propertiesToGroupBy
         request.resultType = resultType
-        NSLog("%@", request)
         return request
     }
 
@@ -41,7 +40,6 @@ public struct QueryBuilder<M: NSManagedObject> {
         return request(entity: M.entity())
     }
 
-    @available(*, deprecated: 5.0)
     public func request<R>(managedObjectModel: NSManagedObjectModel) -> NSFetchRequest<R> {
         return request(entity: M.cdqiEntity(managedObjectModel: managedObjectModel))
     }