kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 17:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved method to proper entityDescription category file

Browse Source
This commit is contained in:
Saul Mora
2011-11-15 00:13:05 -07:00
parent e7856d3ec0
commit 1f79f4d75a
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Categories/DataImport/NSEntityDescription+MagicalDataImport.h
View File

@@ -10,5 +10,6 @@
@interface NSEntityDescription (MagicalRecord_DataImport)
- (NSAttributeDescription *) MR_primaryKeyAttribute;
- (NSManagedObject *) MR_createInstanceFromDictionary:(id)objectData inContext:(NSManagedObjectContext *)context;
@end

10
Source/Categories/DataImport/NSEntityDescription+MagicalDataImport.m
View File

@@ -25,4 +25,14 @@ NSString * const kMagicalRecordImportPrimaryAttributeKey = @"primaryAttributeKey
return primaryAttribute;
}
- (NSManagedObject *) MR_createInstanceFromDictionary:(id)objectData inContext:(NSManagedObjectContext *)context
{
NSManagedObject *relatedObject = [[self class] insertNewObjectForEntityForName:[self name]
inManagedObjectContext:context];
[relatedObject MR_importValuesForKeysWithDictionary:objectData];
return relatedObject;
}
@end

27
Source/Categories/NSManagedObject+MagicalDataImport.m
View File

@@ -65,16 +65,6 @@ NSString * const kMagicalRecordImportRelationshipTypeKey = @"type";
}
}
- (NSManagedObject *) MR_createInstanceForEntity:(NSEntityDescription *)entityDescription withDictionary:(id)objectData
{
NSManagedObject *relatedObject = [NSEntityDescription insertNewObjectForEntityForName:[entityDescription name]
inManagedObjectContext:[self managedObjectContext]];
[relatedObject MR_importValuesForKeysWithDictionary:objectData];
return relatedObject;
}
- (NSManagedObject *) MR_findObjectForRelationship:(NSRelationshipDescription *)relationshipInfo withData:(id)singleRelatedObjectData
{
NSEntityDescription *destinationEntity = [relationshipInfo destinationEntity];
@@ -162,7 +152,7 @@ NSString * const kMagicalRecordImportRelationshipTypeKey = @"type";
NSManagedObject *relatedObject = nil;
if ([objectData isKindOfClass:[NSDictionary class]])
{
relatedObject = [self MR_createInstanceForEntity:[relationshipInfo destinationEntity] withDictionary:objectData];
relatedObject = [[relationshipInfo destinationEntity] MR_createInstanceFromDictionary:objectData inContext:[self managedObjectContext]];
}
else
{
@@ -192,8 +182,7 @@ NSString * const kMagicalRecordImportRelationshipTypeKey = @"type";
withData:objectData];
if (relatedObject == nil)
{
relatedObject = [self MR_createInstanceForEntity:[relationshipInfo destinationEntity]
withDictionary:objectData];
relatedObject = [[relationshipInfo destinationEntity] MR_createInstanceFromDictionary:objectData inContext:[self managedObjectContext]];
}
else
{
@@ -224,17 +213,17 @@ NSString * const kMagicalRecordImportRelationshipTypeKey = @"type";
id value = [objectData MR_valueForAttribute:primaryAttribute];
NSManagedObject *manageObject = [self findFirstByAttribute:[primaryAttribute name] withValue:value inContext:context];
if (!manageObject)
NSManagedObject *managedObject = [self findFirstByAttribute:[primaryAttribute name] withValue:value inContext:context];
if (!managedObject)
{
manageObject = [self createInContext:context];
[manageObject MR_importValuesForKeysWithDictionary:objectData];
managedObject = [self createInContext:context];
[managedObject MR_importValuesForKeysWithDictionary:objectData];
}
else
{
[manageObject MR_updateValuesForKeysWithDictionary:objectData];
[managedObject MR_updateValuesForKeysWithDictionary:objectData];
}
return manageObject;
return managedObject;
}
+ (id) MR_updateFromDictionary:(NSDictionary *)objectData