Testing, new filters and more

Classes/Libs/Filter/Filters.swift

@@ -42,6 +42,18 @@ public func ==* (lhs: String, rhs: StringQueryDataRepresentable?) -> QueryFilter
     return _compare(lhs, .equals, rhs, false)
 }
 
+/// field CONTAINS value
+infix operator ~~
+public func ~~ (lhs: String, rhs: StringQueryDataRepresentable) -> QueryFilter {
+    return _compare(lhs, .contains, rhs)
+}
+
+/// field CONTAINS value, case insensitive
+infix operator ~~*
+public func ~~* (lhs: String, rhs: StringQueryDataRepresentable?) -> QueryFilter {
+    return _compare(lhs, .contains, rhs, false)
+}
+
 /// field != value
 public func != (lhs: String, rhs: QueryDataRepresentable) -> QueryFilter {
     return _compare(lhs, .notEquals, rhs)
@@ -91,6 +103,14 @@ public func <= (lhs: String, rhs: QueryDataRepresentable?) -> QueryFilter {
     return _compare(lhs, .lessThanOrEquals, rhs)
 }
 
+extension QueryFilter {
+
+    public static func custom(_ lhs: String, _ comparison: QueryFilterType, _ rhs: QueryDataRepresentable?, caseSensitive: Bool = true) -> QueryFilter {
+        return _compare(lhs, comparison, rhs, caseSensitive)
+    }
+
+}
+
 private func _compare(_ lhs: String, _ comparison: QueryFilterType, _ rhs: QueryDataRepresentable?, _ caseSensitive: Bool = true) -> QueryFilter {
     return QueryFilter(field: QueryField(name: lhs), type: comparison, value: rhs ?? NULL(), caseSensitive: caseSensitive)
 }

Classes/Libs/Filter/QueryFilter.swift

@@ -39,7 +39,7 @@ extension QueryFilter {
 
     public func asPredicate() -> NSPredicate {
         if let value = value as? String {
-            let predicate = NSPredicate(format: "\(field.name) \(type.interpretation)\(caseSensitive ? "[c]" : "") %@", value)
+            let predicate = NSPredicate(format: "\(field.name) \(type.interpretation)\(caseSensitive ? "" : "[c]") %@", value)
             return predicate
         } else if let value = value as? Bool {
             let predicate = NSPredicate(format: "\(field.name) \(type.interpretation) %@", NSNumber(booleanLiteral: value))

Classes/Libs/Filter/QueryFilterType.swift

@@ -13,6 +13,9 @@ public struct QueryFilterType: Equatable {
 
     enum Storage: Equatable {
         case equals
+        case contains
+        case beginsWith
+        case endsWith
         case notEquals
         case greaterThan
         case lessThan
@@ -25,6 +28,12 @@ public struct QueryFilterType: Equatable {
         switch storage {
         case .equals:
             return "=="
+        case .contains:
+            return "CONTAINS"
+        case .beginsWith:
+            return "BEGINSWITH"
+        case .endsWith:
+            return "ENDSWITH"
         case .notEquals:
             return "!="
         case .greaterThan:
@@ -45,6 +54,12 @@ public struct QueryFilterType: Equatable {
 
     /// ==
     public static var equals: QueryFilterType { return .init(storage: .equals) }
+    /// CONTAINS
+    public static var contains: QueryFilterType { return .init(storage: .contains) }
+    /// BEGINSWITH
+    public static var beginsWith: QueryFilterType { return .init(storage: .beginsWith) }
+    /// ENDSWITH
+    public static var endsWith: QueryFilterType { return .init(storage: .endsWith) }
     /// !=
     public static var notEquals: QueryFilterType { return .init(storage: .notEquals) }
     /// >

Classes/Libs/Query.swift

@@ -10,7 +10,7 @@ import Foundation
 
 
 /// Root query available for each NSManagedObject conforming to Entity
-public class Query<QueryEntityType>: QueryExecutable where QueryEntityType: Entity {
+public class Query<QueryEntityType>: QueryExecutable where QueryEntityType: Entity {    
 
     /// Name of the entity this query will be executed on
     public var entity: QueryEntityType.Type

Classes/Libs/QueryField.swift

@@ -32,11 +32,3 @@ public struct QueryField: Hashable {
     }
 
 }
-
-extension KeyPath where Root: Entity {
-
-    public func makeQueryField() throws -> QueryField {
-        return QueryField(name: String(format: "%K", Value.self as! CVarArg))
-    }
-
-}

Classes/Protocols/Entity.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import CoreData
+@_exported import CoreData
 
 /// Type erased Entity
 public protocol AnyEntity: class {

Classes/Protocols/QueryDataRepresentable.swift

@@ -10,7 +10,6 @@ import Foundation
 
 
 public protocol QueryDataRepresentable {
-//    var value: String { get }
     var isNull: Bool { get }
 }
 
@@ -49,7 +48,13 @@ extension Bool: ExactQueryDataRepresentable {
 
 }
 
+extension Date: QueryDataRepresentable { }
 extension String: StringQueryDataRepresentable { }
+extension Decimal: NumericQueryDataRepresentable { }
+extension Double: NumericQueryDataRepresentable { }
+extension Float: NumericQueryDataRepresentable { }
 extension Int: NumericQueryDataRepresentable { }
 extension Int16: NumericQueryDataRepresentable { }
+extension Int32: NumericQueryDataRepresentable { }
+extension Int64: NumericQueryDataRepresentable { }
 extension Bool: NumericQueryDataRepresentable { }

Classes/Protocols/QueryExecutable.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import CoreData
+@_exported import CoreData
 
 
 public protocol QueryExecutable {
@@ -38,6 +38,10 @@ extension QueryExecutable {
         }
         return fetch
     }
+
+}
+
+extension QueryExecutable where EntityType: NSManagedObject {
 
     public func all(on context: NSManagedObjectContext = CoreData.managedContext) throws -> [EntityType] {
         guard let data = try context.fetch(fetchRequest()) as? [EntityType] else {
@@ -47,12 +51,19 @@ extension QueryExecutable {
     }
 
     public func delete(on context: NSManagedObjectContext = CoreData.managedContext) throws {
-        let deleteRequest = NSBatchDeleteRequest(fetchRequest: fetchRequest())
-
-        guard let persistentStoreCoordinator = context.persistentStoreCoordinator else {
-            throw CoreData.Problem.invalidPersistentStoreCoordinator
+        for object in try all(on: context) {
+            try object.delete(on: context)
         }
-        try persistentStoreCoordinator.execute(deleteRequest, with: context)
+        try context.save()
+
+//        let deleteRequest = NSBatchDeleteRequest(fetchRequest: fetchRequest())
+//        do {
+//            let batchDeleteResult = try context.execute(deleteRequest) as! NSBatchDeleteResult
+//            print("The batch delete request has deleted \(batchDeleteResult.result!) records.")
+//        } catch {
+//            let updateError = error as NSError
+//            print("\(updateError), \(updateError.userInfo)")
+//        }
     }
 
     public func count(on context: NSManagedObjectContext = CoreData.managedContext) throws -> Int {

Demo-iOS/ViewController.swift

@@ -30,7 +30,7 @@ class ViewController: UIViewController {
             hasChimney = !hasChimney
         }
 
-        let all = try! Locomotive.query.filter("hasChimney" == true).filter(.or, "color" == "green", "color" == "black").sort(by: "color", direction: .orderedDescending).all()
+        let all = try! Locomotive.query.filter("hasChimney" == true).filter(.or, "color" == "green", "color" == "black").sort(by: "color", direction: .orderedAscending).all()
         all.forEach { loco in
             print("Color: \(loco.color ?? "Unknown"); Chimney: \(Bool(loco.hasChimney))")
         }