Fix queries

..

Author: helje5

Sources/DirectToSwiftUI/Support/CoreData/DataSource.swift

@@ -64,35 +64,46 @@ public class ManagedObjectDataSource<Object: NSManagedObject>: DataSource {
     try managedObjectContext.fetch(fr)
   }
   public func _primaryFetchCount(_ fr: NSFetchRequest<Object>) throws -> Int {
-    try managedObjectContext.count(for: fr)
+    if fr.resultType != .countResultType {
+      let fr = fr.countCopy()
+      fr.resultType = .countResultType
+      return try managedObjectContext.count(for: fr)
+    }
+    else {
+      return try managedObjectContext.count(for: fr)
+    }
   }
   public func _primaryFetchGlobalIDs(_ fr: NSFetchRequest<NSManagedObjectID>)
               throws -> [ NSManagedObjectID ]
   {
     if fr.resultType != .managedObjectIDResultType {
-      let fs = fr.objectIDsCopy()
-      fs.resultType = .managedObjectIDResultType
-      return try managedObjectContext.fetch(fs)
+      let fr = fr.objectIDsCopy()
+      fr.resultType = .managedObjectIDResultType
+      return try managedObjectContext.fetch(fr)
     }
     else {
       return try managedObjectContext.fetch(fr)
     }
   }
 
   public func fetchGlobalIDs() throws -> [ NSManagedObjectID ] {
-    let fs = fetchRequest?.objectIDsCopy()
+    let fr = fetchRequest?.objectIDsCopy()
           ?? NSFetchRequest<NSManagedObjectID>(entityName: entity.name ?? "")
-    fs.resultType = .managedObjectIDResultType
-    return try _primaryFetchGlobalIDs(fs)
+    fr.resultType = .managedObjectIDResultType
+    return try _primaryFetchGlobalIDs(fr)
   }
-  public func fetchGlobalIDs(_ fs: NSFetchRequest<Object>)
+  public func fetchGlobalIDs(_ fr: NSFetchRequest<Object>)
               throws -> [ NSManagedObjectID ]
   {
-    let fs = fs.objectIDsCopy()
-    fs.resultType = .managedObjectIDResultType
-    return try _primaryFetchGlobalIDs(fs)
+    let fr = fr.objectIDsCopy()
+    fr.resultType = .managedObjectIDResultType
+    return try _primaryFetchGlobalIDs(fr)
   }
-  
+
+  public func fetchCount(_ fr: NSFetchRequest<Object>) throws -> Int {
+    return try _primaryFetchCount(fr)
+  }
+
   public func createObject() -> Object {
     NSEntityDescription.insertNewObject(
       forEntityName: entity.name ?? "",
@@ -104,10 +115,10 @@ public class ManagedObjectDataSource<Object: NSManagedObject>: DataSource {
 public extension ManagedObjectDataSource {
 
   func find() throws -> Object? {
-    let fs = try fetchRequestForFetch()
-    fs.fetchLimit = 2
+    let fr = try fetchRequestForFetch()
+    fr.fetchLimit = 2
 
-    let objects = try _primaryFetchObjects(fs)
+    let objects = try _primaryFetchObjects(fr)
     assert(objects.count < 2)
     return objects.first
   }

Sources/DirectToSwiftUI/Support/CoreData/EntityExtras.swift

@@ -91,6 +91,8 @@ extension NSEntityDescription {
     //       => name:He* 10111 -skyrix +addresses.city:Magdeburg
     // TODO: show message unless cookie is set with instructions (using Semantic
     //       Nag attached to cookie)
+    if qs.isEmpty { return nil }
+    
     let isNumber = Int(qs)
     var q        : NSPredicate? = nil
 

Sources/DirectToSwiftUI/Support/CoreData/FetchRequestExtras.swift

@@ -30,6 +30,13 @@ public extension NSFetchRequest {
     }
     return typed
   }
+  @objc func countCopy() -> NSFetchRequest<NSNumber> {
+    let me = copy()
+    guard let typed = me as? NSFetchRequest<NSNumber> else {
+      fatalError("can't convert fetch request type! \(type(of: me))")
+    }
+    return typed
+  }
 }
 
 public extension NSFetchRequest {

Sources/DirectToSwiftUI/Support/CoreData/PredicateExtras.swift

@@ -132,7 +132,7 @@ public func predicateToMatchAnyValue(_ values: [ String : Any? ]?,
     NSComparisonPredicate(
       leftExpression  : NSExpression(forKeyPath: key),
       rightExpression : NSExpression(forConstantValue: value),
-      modifier: .direct, type: .equalTo,
+      modifier: .direct, type: op,
       options: caseInsensitive ? [ .caseInsensitive ] : []
     )
   }

Sources/DirectToSwiftUI/ViewModel/D2SDisplayGroup.swift

@@ -39,6 +39,7 @@ public final class D2SDisplayGroup<Object: NSManagedObject>
       let q  = and(qs, auxiliaryPredicate)
       guard !q.isEqual(to: fetchRequest.predicate) else { return }
       fetchRequest.predicate = q
+      setNeedsRefetch()
     }
   }
   @Published var sortAttribute : NSAttributeDescription? = nil {
@@ -53,6 +54,7 @@ public final class D2SDisplayGroup<Object: NSManagedObject>
         self.fetchRequest.sortDescriptors =
           dataSource.entity.d2s.defaultSortDescriptors
       }
+      setNeedsRefetch()
     }
   }
 
@@ -142,7 +144,9 @@ public final class D2SDisplayGroup<Object: NSManagedObject>
   private func fetchCount(_ fetchRequest: NSFetchRequest<Object>) {
     // TODO: make async like in ZeeQL version
     do {
-      let count = try dataSource.fetchCount()
+      let count = try dataSource.fetchCount(fetchRequest)
+      globalD2SLogger.trace("fetched count:", count,
+                            "\n  for:", fetchRequest.predicate)
       integrateCount(count)
     }
     catch {
@@ -259,8 +263,6 @@ public final class D2SDisplayGroup<Object: NSManagedObject>
   }
 }
 
-internal let D2SFetchQueue = DispatchQueue(label: "de.zeezide.d2s.fetchqueue")
-
 fileprivate func buildInitialFetchSpec<Object: NSManagedObject>
                    (for     dataSource : ManagedObjectDataSource<Object>,
                     auxiliaryPredicate : NSPredicate?)