Fix return type of aggregate methods — it's not guaranteed to be an N…

…SNumber Closes magicalpanda#709
naqi · Apr 7, 2016 · 098a53d · 098a53d
1 parent 16ac7db
commit 098a53d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.h b/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.h
@@ -23,8 +23,8 @@
 + (BOOL) MR_hasAtLeastOneEntity;
 + (BOOL) MR_hasAtLeastOneEntityInContext:(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_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate inContext:(NSManagedObjectContext *)context;
++ (id) MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate;
 
 /**
  *  Supports aggregating values using a key-value collection operator that can be grouped by an attribute.

diff --git a/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.m b/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.m
@@ -106,7 +106,7 @@ - (id) MR_objectWithMinValueFor:(NSString *)property
 	return [self MR_objectWithMinValueFor:property inContext:[self  managedObjectContext]];
 }
 
-+ (NSNumber *) MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate inContext:(NSManagedObjectContext *)context 
++ (id) MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate inContext:(NSManagedObjectContext *)context
 {
     NSExpression *ex = [NSExpression expressionForFunction:function 
                                                  arguments:[NSArray arrayWithObject:[NSExpression expressionForKeyPath:attributeName]]];
@@ -125,12 +125,11 @@ + (NSNumber *) MR_aggregateOperation:(NSString *)function onAttribute:(NSString
     [request setResultType:NSDictionaryResultType];    
 
     NSDictionary *resultsDictionary = [self MR_executeFetchRequestAndReturnFirstObject:request inContext:context];
-    NSNumber *resultValue = [resultsDictionary objectForKey:@"result"];
 
-    return resultValue;    
+    return [resultsDictionary objectForKey:@"result"];
 }
 
-+ (NSNumber *) MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate 
++ (id) MR_aggregateOperation:(NSString *)function onAttribute:(NSString *)attributeName withPredicate:(NSPredicate *)predicate
 {
     return [self MR_aggregateOperation:function 
                            onAttribute:attributeName