Merge pull request #107 from SeriousMonster/6d94f4ae1b2c460d06c2fa179…

…3e655026e55986a completed shorthand support for aggregate methods by updating shorthand file
magicalpanda · Dec 11, 2011 · abb22be · abb22be
2 parents 8938488 + 6d94f4a
commit abb22be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Source/Categories/NSManagedObject+MagicalRecord.h b/Source/Categories/NSManagedObject+MagicalRecord.h
@@ -99,6 +99,8 @@
 + (NSArray *) MR_findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending;
 + (NSArray *) MR_findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
 
++ (NSNumber *)MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate inContext:(NSManagedObjectContext *)context;
++ (NSNumber *)MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate;
 
 - (id) MR_inContext:(NSManagedObjectContext *)otherContext;
 - (id) MR_inThreadContext;

diff --git a/Source/Categories/NSManagedObject+MagicalRecord.m b/Source/Categories/NSManagedObject+MagicalRecord.m
@@ -737,7 +737,7 @@ - (id) MR_objectWithMinValueFor:(NSString *)property
 	return [self MR_objectWithMinValueFor:property inContext:[self  managedObjectContext]];
 }
 
-+ (NSNumber *)aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate inContext:(NSManagedObjectContext *)context 
++ (NSNumber *) MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate inContext:(NSManagedObjectContext *)context 
 {
     NSExpression *ex = [NSExpression expressionForFunction:function 
                                                  arguments:[NSArray arrayWithObject:[NSExpression expressionForKeyPath:attributeName]]];
@@ -762,9 +762,9 @@ + (NSNumber *)aggregateOperation:(NSString *)function onAttribute:(NSString *)at
     return resultValue;    
 }
 
-+ (NSNumber *)aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate 
++ (NSNumber *) MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate 
 {
-    return [self aggregateOperation:function 
+    return [self MR_aggregateOperation:function 
                         onAttribute:attributeName 
                       withPredicate:predicate
                           inContext:[NSManagedObjectContext MR_defaultContext]];    

diff --git a/Source/MagicalRecordShorthand.h b/Source/MagicalRecordShorthand.h
@@ -87,6 +87,8 @@
 + (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue inContext:(NSManagedObjectContext *)context;
 + (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending;
 + (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context;
++ (NSNumber *)aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate inContext:(NSManagedObjectContext *)context;
++ (NSNumber *)aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate;
 - (id) inContext:(NSManagedObjectContext *)otherContext;
 - (id) inThreadContext;
 + (void) performFetch:(NSFetchedResultsController *)controller;