Fixed CoreData predicate

colemancda · colemancda · commit 83fc28d576a6 · 2023-08-21T05:59:08.000-04:00
diff --git a/Sources/CoreDataModel/NSPredicate.swift b/Sources/CoreDataModel/NSPredicate.swift
@@ -19,7 +19,7 @@ extension NSObject: PredicateEvaluatable {
 }
 */
 
-public extension FetchRequest.Predicate {
+internal extension FetchRequest.Predicate {
     
     func toFoundation() -> NSPredicate {
         
@@ -31,7 +31,7 @@ public extension FetchRequest.Predicate {
     }
 }
 
-public extension FetchRequest.Predicate.Compound {
+internal extension FetchRequest.Predicate.Compound {
     
     func toFoundation() -> NSCompoundPredicate {
         
@@ -40,7 +40,7 @@ public extension FetchRequest.Predicate.Compound {
     }
 }
 
-public extension FetchRequest.Predicate.Compound.Logical​Type {
+internal extension FetchRequest.Predicate.Compound.Logical​Type {
     
     func toFoundation() -> NSCompoundPredicate.LogicalType {
         switch self {
@@ -51,11 +51,16 @@ public extension FetchRequest.Predicate.Compound.Logical​Type {
     }
 }
 
-public extension FetchRequest.Predicate.Comparison {
+internal extension FetchRequest.Predicate.Comparison {
     
     func toFoundation() -> NSComparisonPredicate {
         
         let options = self.options.reduce(NSComparisonPredicate.Options(), { $0.union($1.toFoundation()) })
+        var left = self.left
+        if right.type == .relationship, case var .keyPath(keyPath) = left {
+            keyPath.append(.property(NSManagedObject.BuiltInProperty.id.rawValue))
+            left = .keyPath(keyPath)
+        }
         return NSComparisonPredicate(leftExpression: left.toFoundation(),
                                      rightExpression: right.toFoundation(),
                                      modifier: modifier?.toFoundation() ?? .direct,
@@ -64,7 +69,7 @@ public extension FetchRequest.Predicate.Comparison {
     }
 }
 
-public extension FetchRequest.Predicate.Comparison.Modifier {
+internal extension FetchRequest.Predicate.Comparison.Modifier {
     
     func toFoundation() -> NSComparisonPredicate.Modifier {
         
@@ -75,7 +80,7 @@ public extension FetchRequest.Predicate.Comparison.Modifier {
     }
 }
 
-public extension FetchRequest.Predicate.Comparison.Operator {
+internal extension FetchRequest.Predicate.Comparison.Operator {
     
     func toFoundation() -> NSComparisonPredicate.Operator {
         
@@ -97,7 +102,7 @@ public extension FetchRequest.Predicate.Comparison.Operator {
     }
 }
 
-public extension FetchRequest.Predicate.Comparison.Option {
+internal extension FetchRequest.Predicate.Comparison.Option {
     
     func toFoundation() -> NSComparisonPredicate.Options {
         
@@ -113,7 +118,7 @@ public extension FetchRequest.Predicate.Comparison.Option {
     }
 }
 
-public extension FetchRequest.Predicate.Expression {
+internal extension FetchRequest.Predicate.Expression {
     
     func toFoundation() -> NSExpression {
         

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ extension NSObject: PredicateEvaluatable {`
`19`	`19`	`}`
`20`	`20`	`*/`
`21`	`21`
`22`		`-public extension FetchRequest.Predicate {`
	`22`	`+internal extension FetchRequest.Predicate {`
`23`	`23`
`24`	`24`	`func toFoundation() -> NSPredicate {`
`25`	`25`
`@@ -31,7 +31,7 @@ public extension FetchRequest.Predicate {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`-public extension FetchRequest.Predicate.Compound {`
	`34`	`+internal extension FetchRequest.Predicate.Compound {`
`35`	`35`
`36`	`36`	`func toFoundation() -> NSCompoundPredicate {`
`37`	`37`
`@@ -40,7 +40,7 @@ public extension FetchRequest.Predicate.Compound {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-public extension FetchRequest.Predicate.Compound.LogicalType {`
	`43`	`+internal extension FetchRequest.Predicate.Compound.LogicalType {`
`44`	`44`
`45`	`45`	`func toFoundation() -> NSCompoundPredicate.LogicalType {`
`46`	`46`	`switch self {`
`@@ -51,11 +51,16 @@ public extension FetchRequest.Predicate.Compound.LogicalType {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-public extension FetchRequest.Predicate.Comparison {`
	`54`	`+internal extension FetchRequest.Predicate.Comparison {`
`55`	`55`
`56`	`56`	`func toFoundation() -> NSComparisonPredicate {`
`57`	`57`
`58`	`58`	`let options = self.options.reduce(NSComparisonPredicate.Options(), { $0.union($1.toFoundation()) })`
	`59`	`+ var left = self.left`
	`60`	`+ if right.type == .relationship, case var .keyPath(keyPath) = left {`
	`61`	`+ keyPath.append(.property(NSManagedObject.BuiltInProperty.id.rawValue))`
	`62`	`+ left = .keyPath(keyPath)`
	`63`	`+ }`
`59`	`64`	`return NSComparisonPredicate(leftExpression: left.toFoundation(),`
`60`	`65`	`rightExpression: right.toFoundation(),`
`61`	`66`	`modifier: modifier?.toFoundation() ?? .direct,`
`@@ -64,7 +69,7 @@ public extension FetchRequest.Predicate.Comparison {`
`64`	`69`	`}`
`65`	`70`	`}`
`66`	`71`
`67`		`-public extension FetchRequest.Predicate.Comparison.Modifier {`
	`72`	`+internal extension FetchRequest.Predicate.Comparison.Modifier {`
`68`	`73`
`69`	`74`	`func toFoundation() -> NSComparisonPredicate.Modifier {`
`70`	`75`
`@@ -75,7 +80,7 @@ public extension FetchRequest.Predicate.Comparison.Modifier {`
`75`	`80`	`}`
`76`	`81`	`}`
`77`	`82`
`78`		`-public extension FetchRequest.Predicate.Comparison.Operator {`
	`83`	`+internal extension FetchRequest.Predicate.Comparison.Operator {`
`79`	`84`
`80`	`85`	`func toFoundation() -> NSComparisonPredicate.Operator {`
`81`	`86`
`@@ -97,7 +102,7 @@ public extension FetchRequest.Predicate.Comparison.Operator {`
`97`	`102`	`}`
`98`	`103`	`}`
`99`	`104`
`100`		`-public extension FetchRequest.Predicate.Comparison.Option {`
	`105`	`+internal extension FetchRequest.Predicate.Comparison.Option {`
`101`	`106`
`102`	`107`	`func toFoundation() -> NSComparisonPredicate.Options {`
`103`	`108`
`@@ -113,7 +118,7 @@ public extension FetchRequest.Predicate.Comparison.Option {`
`113`	`118`	`}`
`114`	`119`	`}`
`115`	`120`
`116`		`-public extension FetchRequest.Predicate.Expression {`
	`121`	`+internal extension FetchRequest.Predicate.Expression {`
`117`	`122`
`118`	`123`	`func toFoundation() -> NSExpression {`
`119`	`124`