Merge branch 'null-relationship' of https://github.com/Sigmapoint/Mag…

…icalRecord into Sigmapoint-null-relationship
mashkovmax · Jun 21, 2019 · ad79e25 · ad79e25
2 parents b91e55b + 990d68f
commit ad79e25
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m b/MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m
@@ -190,7 +190,7 @@ - (void)MR_setRelationships:(NSDictionary *)relationships forKeysWithObject:(id)
         }
         @finally
         {
-            if (relatedObjectData == nil || [relatedObjectData isEqual:[NSNull null]])
+            if (relatedObjectData == nil)
             {
                 continue;
             }
@@ -210,6 +210,12 @@ - (void)MR_setRelationships:(NSDictionary *)relationships forKeysWithObject:(id)
             continue;
         }
 
+        if ([relatedObjectData isEqual:[NSNull null]])
+        {
+            [self setValue:nil forKey:relationshipName];
+            continue;
+        }
+
         if ([relationshipInfo isToMany] && [relatedObjectData isKindOfClass:[NSArray class]])
         {
             for (id singleRelatedObjectData in relatedObjectData)