Commit Graph

365 Commits

Author SHA1 Message Date
Saul Mora
5053bc820f use prefixed methods 2012-01-31 12:32:26 -07:00
Brian Doig
8c0a0847a9 Fix nested update that would change to import more than one level deep. 2012-01-30 18:15:22 -08:00
Saul Mora
97478ce328 update paramter to reflect object level importing 2012-01-29 17:25:41 -07:00
Saul Mora
b2158dbb39 don't warn on performSelector messages. 2012-01-25 10:14:15 -07:00
Saul Mora
8f6522b61c Renaming import methods to reflect general object usage (ie. importFromObject, not dictionary)
Add helper to set default model from a bundle for a particular class. Useful for unit testing with OCUnit
2012-01-25 09:57:12 -07:00
Saul Mora
f950ff1bd1 Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord 2012-01-19 16:47:00 -07:00
Saul Mora
fe852e70f1 Updated mogenerator 2012-01-19 16:46:19 -07:00
Magical Panda Software
9e92b7dee5 Making things work more better for iOS5 and background queues 2012-01-16 12:50:56 -07:00
Magical Panda Software
6f9627d83b One more header fix 2012-01-16 00:24:33 -07:00
Magical Panda Software
18c0883442 Fixing evil merge conflict 2012-01-16 00:22:52 -07:00
Magical Panda Software
f806ef5eee Use performBlockAndWait for all context interactions
Renamed import methods to reflect id parameter (objects, not just dictionaries)
Added findOrCreate pattern method
Added error callback in default error handler method
2012-01-15 23:52:44 -07:00
Saul Mora
6928c16345 Adding recursive save of context 2012-01-11 14:57:31 -07:00
Richard Skala
77c38d85b7 - Added by Xcode. 2012-01-11 12:03:17 -08:00
Brian Doig
a5672d9c75 Scheme changed 2012-01-05 15:56:19 -08:00
Brian Doig
33758e7771 First commit from this machine 2012-01-05 12:32:50 -08:00
Brian Doig
298bbf1304 Accidentially added the unit test xcdatamodel to project, causing the mogenerator scripts to be invoked during a compile. Removed files created by accident. 2012-01-04 12:46:44 -08:00
Brian Doig
5fe9545abd changed variable not to not be a C++ reserved word 'class' that prevented precompiled headers to be created for Objective-C++ 2012-01-04 12:42:05 -08:00
Brian Doig
c8b6fa9c66 Initial commit with fix of two compile problems due to missing headers when pre compiled header file not included. 2012-01-04 12:40:48 -08:00
Greg Furmanek
1195ae1191 Merge branch 'magical_master' 2011-12-30 20:29:43 -08:00
Greg Furmanek
5901ad6c4f updated gitignore 2011-12-30 20:29:21 -08:00
Magical Panda Software
fe59756d04 Merge pull request #123 from vojto/master
EXC_BAD_ACCESS when property is not found
2011-12-29 09:18:17 -08:00
Vojto Rinik
6756aef886 Fixing an issue that would cause EXC_BAD_ACCESS when property
is not found.
2011-12-29 18:09:55 +01:00
Greg Furmanek
59f179e9a7 compiling mac side 2011-12-28 23:28:53 -08:00
Magical Panda Software
eb4aaec679 Merge pull request #121 from tonyxiao/master
MagicalRecordShorthand.h doesn't compile on Mac with MR_SHORTHAND macro defined.
2011-12-28 20:23:26 -08:00
tonyxiao
feffba86e7 Update Readme.md to reflect recent changes, especially the MR_SHORTHAND macro 2011-12-28 23:19:53 -05:00
Tony Xiao
5452a2946f Added in test for iOS target in MagicalRecordShorthand.h to make it compile on Mac-only targets 2011-12-28 23:10:19 -05:00
Magical Panda Software
73ceae7e66 Merge pull request #120 from rickerbh/fix-icloud-queue-error
Modified macro to avoid "Can only use -performBlock" error
2011-12-28 20:06:27 -08:00
rickerbh
121020a2c9 Modified macro to avoid "Can only use -performBlock" error 2011-12-29 15:03:45 +11:00
Saul Mora
2209c3e3a7 Added support for easy setup with OCTest 2011-12-28 19:26:53 -07:00
Saul Mora
6b4ef06007 Reusing other request methods where possible
Fix enumeration problem in updateFromArray
2011-12-17 18:57:00 -07:00
Saul Mora
0c4ea10ba6 Fix: Crash when fetching with findByAttribute:withValue:
Add more safety checks between iOS4 and iOS5
add updateFromArray method for data import
2011-12-17 18:04:36 -07:00
Magical Panda Software
667738a6c1 Merge pull request #108 from tonyarnold/master
Fix clang warning in NSManagedObjectContext category
2011-12-12 22:35:23 -08:00
Tony Arnold
260d86c5e1 Fix clang warning
Clang seems to need the diagnostic pragma to cover the
`THREAD_ISOLATION_ENABLED()` macro as well as the `performSelector:`
method to suppress this warning.
2011-12-13 17:10:01 +11:00
Saul Mora
7c54dd558c Removed all release/retain/autorelease macros for backward comatibility 2011-12-11 14:31:55 -07:00
Saul Mora
7567e75e17 Fix crash when setting main context as parent in background on iOS5
Readd (again) checks for iCloud changes to background contexts
2011-12-11 14:24:14 -07:00
Saul Mora
bc4ae81023 Fix compile error for assoc. reference key
re-compiled entities with latest version of mogenerator
1.8.3
2011-12-11 14:02:13 -07:00
Saul Mora
b446251c21 Merge https://github.com/crayment/MagicalRecord into log-in-debug
Conflicts:
	Source/Categories/NSPersistentStore+MagicalRecord.m
	Source/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
	Source/CoreData+MagicalRecord.h
2011-12-11 13:29:02 -07:00
Saul Mora
be9d5c44ee Include all sub entities by default when deleting using a predicate 2011-12-11 13:19:08 -07:00
Saul Mora
52aaff9487 Adjusting tests for context notifications to depend on which platform is running. 2011-12-11 13:16:46 -07:00
Saul Mora
6e2cfd8151 Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord 2011-12-11 13:05:26 -07:00
Saul Mora
a689dfe612 Fix broken tests on iOS4.3 and iOS5
Fix data import on iOS4.3
2011-12-11 13:05:15 -07:00
Magical Panda Software
abb22bebdc Merge pull request #107 from SeriousMonster/6d94f4ae1b2c460d06c2fa1793e655026e55986a
completed shorthand support for aggregate methods by updating shorthand file
2011-12-11 09:48:31 -08:00
Duane Fields
6d94f4ae1b added aggregate methods to shorthand file 2011-12-11 11:00:34 -06:00
Duane Fields
aba82b2619 added aggregate methods to the category header and renamed to use MR_ prefix 2011-12-10 14:05:02 -06:00
Saul Mora
07538d5a1a Fix: Set the default store properly when creating a new default context 2011-12-10 10:32:23 -07:00
Saul Mora
6de353f3d1 Refactor tests to use property name different from super class 2011-12-10 10:31:47 -07:00
Saul Mora
78262cbad7 Fix: extract NSString categories to external file 2011-12-10 10:31:11 -07:00
Saul Mora
8938488d2e Fix Core Foundation version number.
Merge from 25e5029164 was overwritten somehow too :(
1.8.2
2011-12-08 12:55:17 -07:00
Saul Mora
3cf33f47ae Check for iCloud in particular operations 2011-12-08 12:52:48 -07:00
Saul Mora
db986748c4 Using descriptive macros to help imply reason for certain method calls, ie. initWithConcurrencyType: 2011-12-08 12:38:10 -07:00