Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

completed shorthand support for aggregate methods by updating shorthand file #107

Merged
merged 2 commits into from
Dec 11, 2011
Merged

completed shorthand support for aggregate methods by updating shorthand file #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aba82b2
added aggregate methods to the category header and renamed to use MR_…
duanefields Dec 10, 2011
6d94f4a
added aggregate methods to shorthand file
duanefields Dec 11, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Source/Categories/NSManagedObject+MagicalRecord.h
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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;
+ (NSArray *) MR_findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context; + (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_inContext:(NSManagedObjectContext *)otherContext;
- (id) MR_inThreadContext; - (id) MR_inThreadContext;
Expand Down
6 changes: 3 additions & 3 deletions Source/Categories/NSManagedObject+MagicalRecord.m
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ - (id) MR_objectWithMinValueFor:(NSString *)property
return [self MR_objectWithMinValueFor:property inContext:[self managedObjectContext]]; 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 NSExpression *ex = [NSExpression expressionForFunction:function
arguments:[NSArray arrayWithObject:[NSExpression expressionForKeyPath:attributeName]]]; arguments:[NSArray arrayWithObject:[NSExpression expressionForKeyPath:attributeName]]];
Expand All @@ -762,9 +762,9 @@ + (NSNumber *)aggregateOperation:(NSString *)function onAttribute:(NSString *)at
return resultValue; 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 onAttribute:attributeName
withPredicate:predicate withPredicate:predicate
inContext:[NSManagedObjectContext MR_defaultContext]]; inContext:[NSManagedObjectContext MR_defaultContext]];
Expand Down
2 changes: 2 additions & 0 deletions Source/MagicalRecordShorthand.h
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@
+ (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue inContext:(NSManagedObjectContext *)context; + (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;
+ (NSArray *) findByAttribute:(NSString *)attribute withValue:(id)searchValue andOrderBy:(NSString *)sortTerm ascending:(BOOL)ascending inContext:(NSManagedObjectContext *)context; + (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) inContext:(NSManagedObjectContext *)otherContext;
- (id) inThreadContext; - (id) inThreadContext;
+ (void) performFetch:(NSFetchedResultsController *)controller; + (void) performFetch:(NSFetchedResultsController *)controller;
Expand Down