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

#1802 don't reuse deleted objects when mapping a relationship with identification attributes and managed object cache #1881

Closed
wants to merge 14 commits into from
Closed

#1802 don't reuse deleted objects when mapping a relationship with identification attributes and managed object cache #1881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2c51aa3
Merge branch 'hotfix/fix-nil-assignment-bug'
Nov 15, 2013
717374c
Change valueForKey to valueForKeyPath to fix crash on retrieving para…
sfcd Dec 10, 2013
232f7f0
Merge pull request #1709 from softfacade/master
segiddins Dec 10, 2013
aa61169
Fix incorrect method name.
Dec 26, 2013
a7dcdce
Merge pull request #1727 from zkhalapyan/master
blakewatters Jan 2, 2014
79a91c6
managedObject retrieved from managedObjectCache could be deleted.
lubbo Apr 22, 2014
aa1f763
Test Case Updated
lubbo Apr 22, 2014
b71502b
Merge branch 'release/0.23.0'
Apr 23, 2014
971bc72
Update Podspec
Apr 23, 2014
7373a43
Merge branch 'release/0.23.1'
Apr 24, 2014
a7d4d3e
Merge branch 'development'
segiddins Jul 17, 2014
e93ffbb
managedObject retrieved from managedObjectCache could be deleted.
lubbo Apr 22, 2014
f120160
Test Case Updated
lubbo Apr 22, 2014
cff22d0
Merge branch '#1802-Don't-reuse-deleted-objects-when-mapping-a-relati…
lubbo Aug 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Code/CoreData/RKManagedObjectMappingOperationDataSource.m
View file
Open in desktop
Expand Up @@ -271,7 +271,7 @@ - (id)mappingOperation:(RKMappingOperation *)mappingOperation targetObjectForRep
}
}

if (managedObject == nil) {
if (managedObject == nil || [managedObject isDeleted]) {
managedObject = [[NSManagedObject alloc] initWithEntity:entity insertIntoManagedObjectContext:self.managedObjectContext];
[managedObject setValuesForKeysWithDictionary:entityIdentifierAttributes];
if (entityMapping.persistentStore) [self.managedObjectContext assignObject:managedObject toPersistentStore:entityMapping.persistentStore];
Expand Down
6 changes: 4 additions & 2 deletions Tests/Logic/ObjectMapping/RKObjectMappingNextGenTest.m
View file
Open in desktop
Expand Up @@ -2050,12 +2050,14 @@ - (void)testReplacmentPolicyForToManyCoreDataRelationshipDeletesExistingValues
- (void)testReplacmentPolicyForToManyCoreDataRelationshipDoesNotDeleteNewValuesOnSecondMapping
{
RKManagedObjectStore *managedObjectStore = [RKTestFactory managedObjectStore];
managedObjectStore.managedObjectCache = [[RKInMemoryManagedObjectCache alloc] initWithManagedObjectContext:managedObjectStore.persistentStoreManagedObjectContext];
RKHuman *human = [NSEntityDescription insertNewObjectForEntityForName:@"Human" inManagedObjectContext:managedObjectStore.mainQueueManagedObjectContext];

RKEntityMapping *entityMapping = [RKEntityMapping mappingForEntityForName:@"Human" inManagedObjectStore:managedObjectStore];
[entityMapping addAttributeMappingsFromArray:@[ @"name" ]];
RKEntityMapping *catMapping = [RKEntityMapping mappingForEntityForName:@"Cat" inManagedObjectStore:managedObjectStore];
[catMapping addAttributeMappingsFromArray:@[ @"name" ]];
catMapping.identificationAttributes = @[ @"name" ];
RKRelationshipMapping *relationshipMapping = [RKRelationshipMapping relationshipMappingFromKeyPath:@"cats" toKeyPath:@"cats" withMapping:catMapping];
relationshipMapping.assignmentPolicy = RKReplaceAssignmentPolicy;
[entityMapping addPropertyMapping:relationshipMapping];
Expand All @@ -2064,7 +2066,7 @@ - (void)testReplacmentPolicyForToManyCoreDataRelationshipDoesNotDeleteNewValuesO
NSDictionary *dictionary = @{ @"name": @"Blake", @"cats": @[ @{ @"name": @"Roy" } ] };

RKMappingOperation *firstOperation = [[RKMappingOperation alloc] initWithSourceObject:dictionary destinationObject:human mapping:entityMapping];
RKManagedObjectMappingOperationDataSource *firstDataSource = [[RKManagedObjectMappingOperationDataSource alloc] initWithManagedObjectContext:managedObjectStore.mainQueueManagedObjectContext cache:nil];
RKManagedObjectMappingOperationDataSource *firstDataSource = [[RKManagedObjectMappingOperationDataSource alloc] initWithManagedObjectContext:managedObjectStore.mainQueueManagedObjectContext cache:managedObjectStore.managedObjectCache];
firstOperation.dataSource = firstDataSource;

[firstOperation performMapping:&error];
Expand All @@ -2075,7 +2077,7 @@ - (void)testReplacmentPolicyForToManyCoreDataRelationshipDoesNotDeleteNewValuesO
assertThat(firstCatNames, hasItems(@"Roy", nil));

RKMappingOperation *secondOperation = [[RKMappingOperation alloc] initWithSourceObject:dictionary destinationObject:human mapping:entityMapping];
RKManagedObjectMappingOperationDataSource *secondDataSource = [[RKManagedObjectMappingOperationDataSource alloc] initWithManagedObjectContext:managedObjectStore.mainQueueManagedObjectContext cache:nil];
RKManagedObjectMappingOperationDataSource *secondDataSource = [[RKManagedObjectMappingOperationDataSource alloc] initWithManagedObjectContext:managedObjectStore.mainQueueManagedObjectContext cache:managedObjectStore.managedObjectCache];
secondOperation.dataSource = secondDataSource;

[secondOperation performMapping:&error];
Expand Down