fix: support optional operators

kylef · kylef · commit 5316d7b54d19 · 2020-03-03T22:17:03.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Master
 
+### Bug Fixes
+
+* Prevents fatal error when handling operators with optional `Date` types.
+
+## 0.14.0
+
 ### Breaking
 
 * Drops support for Swift 3 and Swift 4. Swift 5 or newer must be used.
diff --git a/Sources/QueryKit/Attribute.swift b/Sources/QueryKit/Attribute.swift
@@ -43,10 +43,7 @@ public struct Attribute<AttributeType> : Equatable {
         }
       }
 
-      let value = unsafeBitCast(value, to: Optional<String>.self)
-      if let value = value {
-        return NSExpression(forConstantValue: value)
-      }
+      return NSExpression(forConstantValue: value)
     }
 
     return NSExpression(forConstantValue: NSNull())
diff --git a/Tests/QueryKitTests/KeyPathTests.swift b/Tests/QueryKitTests/KeyPathTests.swift
@@ -12,6 +12,11 @@ class KeyPathTests: XCTestCase {
     XCTAssertEqual(predicate.predicate, NSPredicate(format:"name == %@", NSNull()))
   }
 
+  func testOptionalEqualityOperatorWithOptional() {
+    let predicate: Predicate<User> = \User.createdAt == nil
+    XCTAssertEqual(predicate.predicate, NSPredicate(format:"createdAt == %@", NSNull()))
+  }
+
   func testInequalityOperator() {
     let predicate: Predicate<User> = \User.name != "kyle"
     XCTAssertEqual(predicate.predicate, NSPredicate(format:"name != 'kyle'"))
@@ -118,4 +123,5 @@ class KeyPathNSPredicateTests: XCTestCase {
 class User: NSManagedObject {
   @objc var name: String?
   @NSManaged var age: Int
+  @objc var createdAt: Date?
 }

Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,7 @@ public struct Attribute<AttributeType> : Equatable {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`- let value = unsafeBitCast(value, to: Optional<String>.self)`
`47`		`- if let value = value {`
`48`		`- return NSExpression(forConstantValue: value)`
`49`		`- }`
	`46`	`+ return NSExpression(forConstantValue: value)`
`50`	`47`	`}`
`51`	`48`
`52`	`49`	`return NSExpression(forConstantValue: NSNull())`