Changeset 325

Timestamp:

09/01/08 08:57:34 (4 months ago)

Author:

wolf

Message:

[NEW] mogenerator 1.12: Handle relationships in the left-hand side of fetch request predicate expressions.
[FIX] failure when handling fetch requests without a filtering predicate.

Files:

• trunk/cocoa/mogenerator/mogenerator.m (modified) (3 diffs)
• trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_ChildMO.h (modified) (1 diff)
• trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_ChildMO.m (modified) (1 diff)
• trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_HumanMO.h (modified) (1 diff)
• trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_HumanMO.m (modified) (1 diff)
• trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/include.m (modified) (1 diff)
• trunk/cocoa/mogenerator/mogeneratorTestMule/mogeneratorTestMule_DataModel.xcdatamodel/elements (modified) (previous)
• trunk/cocoa/mogenerator/mogeneratorTestMule/mogeneratorTestMule_DataModel.xcdatamodel/layout (modified) (previous)

trunk/cocoa/mogenerator/mogenerator.m

@@ -70 +70 @@
-}
-- (void)_processPredicate:(NSPredicate*)predicate_ bindings:(NSMutableArray*)bindings_ {
+    if (!predicate_) return;
+    
-        if ([predicate_ isKindOfClass:[NSCompoundPredicate class]]) {
-                nsenumerate([(NSCompoundPredicate*)predicate_ subpredicates], NSPredicate, subpredicate) {
@@ -93 +95 @@
-                if (attribute) {
-                    type = [attribute objectAttributeType];
-                    type = [type stringByAppendingString:@"*"];
-                } else {
-                    //  Probably a relationship
-
+
+
+
-                }
+                type = [type stringByAppendingString:@"*"];
-                
-                                [bindings_ addObject:[NSDictionary dictionaryWithObjectsAndKeys:
@@ -329 +333 @@
-    if (_version)
-    {
-1
+2
-        return EXIT_SUCCESS;
-    }

trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_ChildMO.h

@@ -36 +36 @@
-
-
+
++ (NSArray*)fetchByParent:(NSManagedObjectContext*)moc_ parent:(ParentMO*)parent_;
++ (NSArray*)fetchByParent:(NSManagedObjectContext*)moc_ parent:(ParentMO*)parent_ error:(NSError**)error_;
+
+
-@end

trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_ChildMO.m

@@ -57 +57 @@
-
-
+
++ (NSArray*)fetchByParent:(NSManagedObjectContext*)moc_ parent:(ParentMO*)parent_ {
+        NSError *error = nil;
+        NSArray *result = [self fetchByParent:moc_ parent:parent_ error:&error];
+        if (error) {
+                [NSApp presentError:error];
+        }
+        return result;
+}
++ (NSArray*)fetchByParent:(NSManagedObjectContext*)moc_ parent:(ParentMO*)parent_ error:(NSError**)error_ {
+        NSError *error = nil;
+        
+        NSManagedObjectModel *model = [[moc_ persistentStoreCoordinator] managedObjectModel];
+        NSFetchRequest *fetchRequest = [model fetchRequestFromTemplateWithName:@"byParent"
+                                                                                                         substitutionVariables:[NSDictionary dictionaryWithObjectsAndKeys:
+                                                                                                                
+                                                                                                                parent_, @"parent",
+                                                                                                                
+                                                                                                                nil]
+                                                                                                         ];
+        NSAssert(fetchRequest, @"Can't find fetch request named \"byParent\".");
+        
+        NSArray *result = [moc_ executeFetchRequest:fetchRequest error:&error];
+        if (error_) *error_ = error;
+        return result;
+}
+
+
-@end

trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_HumanMO.h

@@ -58 +58 @@
-
-
+
++ (NSArray*)fetchAllHumans:(NSManagedObjectContext*)moc_ ;
++ (NSArray*)fetchAllHumans:(NSManagedObjectContext*)moc_  error:(NSError**)error_;
+
+
-@end

trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/_HumanMO.m

@@ -151 +151 @@
-
-
+
++ (NSArray*)fetchAllHumans:(NSManagedObjectContext*)moc_  {
+        NSError *error = nil;
+        NSArray *result = [self fetchAllHumans:moc_  error:&error];
+        if (error) {
+                [NSApp presentError:error];
+        }
+        return result;
+}
++ (NSArray*)fetchAllHumans:(NSManagedObjectContext*)moc_  error:(NSError**)error_ {
+        NSError *error = nil;
+        
+        NSManagedObjectModel *model = [[moc_ persistentStoreCoordinator] managedObjectModel];
+        NSFetchRequest *fetchRequest = [model fetchRequestFromTemplateWithName:@"allHumans"
+                                                                                                         substitutionVariables:[NSDictionary dictionaryWithObjectsAndKeys:
+                                                                                                                
+                                                                                                                nil]
+                                                                                                         ];
+        NSAssert(fetchRequest, @"Can't find fetch request named \"allHumans\".");
+        
+        NSArray *result = [moc_ executeFetchRequest:fetchRequest error:&error];
+        if (error_) *error_ = error;
+        return result;
+}
+
+
-@end

trunk/cocoa/mogenerator/mogeneratorTestMule/MOs/include.m

@@ +1 @@
+#include "ChildMO.m"
+#include "_ChildMO.m"
-#include "ParentMO.m"
-#include "_ParentMO.m"
-#include "HumanMO.m"
-#include "_HumanMO.m"
-#include "ChildMO.m"
-#include "_ChildMO.m"