Merge pull request #273 from Chm/master

fixes for relationship migrations

Author: DanielBroad

Incremental Store/EncryptedStore.m

@@ -716,11 +716,12 @@ - (id)newValueForRelationship:(NSRelationshipDescription *)relationship
 
     if (![relationship isToMany]) {
         // to-one relationship, foreign key exists in source entity table
-        
+        BOOL shouldFetchSourceEntityType = [self entityNeedsEntityTypeColumn:sourceEntity];
+
         NSString *string = [NSString stringWithFormat:
                             @"SELECT %@%@ FROM %@ WHERE __objectID=?",
                             [self foreignKeyColumnForRelationship:relationship],
-                            shouldFetchDestinationEntityType ? @", __entityType" : @"",
+                            shouldFetchSourceEntityType ? @", __entityType" : @"",
                             [self tableNameForEntity:sourceEntity]];
         statement = [self preparedStatementForQuery:string];
         sqlite3_bind_int64(statement, 1, key);
@@ -1459,18 +1460,18 @@ - (BOOL)migrateFromModel:(NSManagedObjectModel *)fromModel toModel:(NSManagedObj
             case NSAddEntityMappingType: {
                 NSString *destRootEntityName = [self rootForEntity:destinationEntity].name;
                 NSEntityDescription *destRootEntity = destinationEntities[destRootEntityName];
-                if ([updatedRootEntities containsObject:destRootEntity]) {
-                    return;
-                }
-                [updatedRootEntities addObject:destRootEntity];
+                if (![updatedRootEntities containsObject:destRootEntity]) {
+                    [updatedRootEntities addObject:destRootEntity];
 
-                NSString *srcRootEntityName = destRootEntity.name;
-                NSEntityDescription *srcRootEntity = [sourceEntities objectForKey:srcRootEntityName];
+                    NSString *srcRootEntityName = destRootEntity.name;
+                    NSEntityDescription *srcRootEntity = [sourceEntities objectForKey:srcRootEntityName];
+
+                    success &= [self alterTableForSourceEntity:srcRootEntity
+                                             destinationEntity:destinationEntity
+                                                   withMapping:nil
+                                                         error:error];
+                }
 
-                success &= [self alterTableForSourceEntity:srcRootEntity
-                                         destinationEntity:destinationEntity
-                                               withMapping:nil
-                                                     error:error];
                 [destinationEntity.directRelationshipsByName enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSRelationshipDescription * _Nonnull obj, BOOL * _Nonnull relationshipStop) {
                     NSString *tableName = [self tableNameForRelationship:obj];
                     BOOL hasTable;
@@ -1496,15 +1497,15 @@ - (BOOL)migrateFromModel:(NSManagedObjectModel *)fromModel toModel:(NSManagedObj
 
                 NSString *destRootEntityName = srcRootEntity.name;
                 NSEntityDescription *destRootEntity = [destinationEntities objectForKey:destRootEntityName];
-                if ([updatedRootEntities containsObject:destRootEntity]) {
-                    return;
+                if (![updatedRootEntities containsObject:destRootEntity]) {
+                    [updatedRootEntities addObject:destRootEntity];
+
+                    success &= [self alterTableForSourceEntity:srcRootEntity
+                                             destinationEntity:destRootEntity
+                                                   withMapping:nil
+                                                         error:error];
                 }
-                [updatedRootEntities addObject:destRootEntity];
 
-                success &= [self alterTableForSourceEntity:srcRootEntity
-                                         destinationEntity:destRootEntity
-                                               withMapping:nil
-                                                     error:error];
                 // TODO: should we remove many-to-many relationship tables here?
             } break;
 
@@ -1514,15 +1515,15 @@ - (BOOL)migrateFromModel:(NSManagedObjectModel *)fromModel toModel:(NSManagedObj
                 NSString *destRootEntityName = [self rootForEntity:destinationEntity].name;
                 NSEntityDescription *srcRootEntity = sourceEntities[srcRootEntityName];
                 NSEntityDescription *destRootEntity = destinationEntities[destRootEntityName];
-                if ([updatedRootEntities containsObject:destRootEntity]) {
-                    return;
+                if (![updatedRootEntities containsObject:destRootEntity]) {
+                    [updatedRootEntities addObject:destRootEntity];
+
+                    success &= [self alterTableForSourceEntity:srcRootEntity
+                                             destinationEntity:destRootEntity
+                                                   withMapping:nil
+                                                         error:error];
                 }
-                [updatedRootEntities addObject:destRootEntity];
 
-                success &= [self alterTableForSourceEntity:srcRootEntity
-                                         destinationEntity:destRootEntity
-                                               withMapping:nil
-                                                     error:error];
                 if (success) {
                     success &= [self alterRelationshipForSourceEntity:sourceEntity
                                                     destinationEntity:destinationEntity