Fixes rentzsch#15: failed assertion 'relationship': fetch requests wi…

…th substitution variables. Tests passing.
ddrccw · Jan 14, 2013 · a9b1441 · a9b1441
1 parent 0b3b0e2
commit a9b1441
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/mogenerator.m b/mogenerator.m
@@ -186,9 +186,14 @@ - (NSString*)_resolveKeyPathType:(NSString*)keyPath {
 
     NSEntityDescription *entity = self;
     nsenumerate(components, NSString, key) {
-        NSRelationshipDescription *relationship = [[entity relationshipsByName] objectForKey:key];
-        assert(relationship);
-        entity = [relationship destinationEntity];
+        id property = [[entity propertiesByName] objectForKey:key];
+        if ([property isKindOfClass:[NSAttributeDescription class]]) {
+            NSString *result = [property objectAttributeType];
+            return [result substringToIndex:[result length] -1];
+        } else if ([property isKindOfClass:[NSRelationshipDescription class]]) {
+            entity = [property destinationEntity];
+        }
+        assert(property);
     }
 
     return [entity managedObjectClassName];

diff --git a/test/test.xcdatamodel/elements b/test/test.xcdatamodel/elements
diff --git a/test/test.xcdatamodel/layout b/test/test.xcdatamodel/layout