Additional testing for many-to-many change tracking

Part of #19003 Mostly tests, but also fixes to navigation fixup to/from join entities
dotnet · Jul 16, 2020 · 26d9edc · 26d9edc
1 parent c97657e
commit 26d9edc
Show file tree

Hide file tree

Showing 9 changed files with 1,776 additions and 164 deletions.
diff --git a/src/EFCore/ChangeTracking/Internal/NavigationFixer.cs b/src/EFCore/ChangeTracking/Internal/NavigationFixer.cs
@@ -244,8 +244,7 @@ public virtual void NavigationCollectionChanged(
 
                         if (navigationBase is ISkipNavigation skipNavigation)
                         {
-                            var associationEntry = FindAssociationEntry(entry, oldTargetEntry, skipNavigation);
-                            associationEntry?.SetEntityState(EntityState.Deleted);
+                            FindAssociationEntry(entry, oldTargetEntry, skipNavigation)?.SetEntityState(EntityState.Deleted);
 
                             if (skipNavigation.Inverse.IsCollection)
                             {
@@ -299,7 +298,15 @@ public virtual void NavigationCollectionChanged(
 
                             if (associationEntry.EntityState == EntityState.Detached)
                             {
-                                associationEntry.SetEntityState(EntityState.Added);
+                                try
+                                {
+                                    _inFixup = false;
+                                    associationEntry.SetEntityState(EntityState.Added);
+                                }
+                                finally
+                                {
+                                    _inFixup = true;
+                                }
                             }
 
                             if (skipNavigation.Inverse.IsCollection)
@@ -569,10 +576,6 @@ public virtual void StateChanged(
                 {
                     DeleteFixup(entry);
                 }
-                else if (entry.EntityState == EntityState.Deleted)
-                {
-                    DeleteSkipNavigationFixup(entry);
-                }
             }
             finally
             {
@@ -626,12 +629,6 @@ private void DeleteFixup(InternalEntityEntry entry)
                     }
                 }
             }
-        }
-
-        private void DeleteSkipNavigationFixup(InternalEntityEntry entry)
-        {
-            var entityType = entry.EntityType;
-            var stateManager = entry.StateManager;
 
             foreach (var skipNavigation in entityType.GetSkipNavigations())
             {
@@ -644,11 +641,9 @@ private void DeleteSkipNavigationFixup(InternalEntityEntry entry)
                         foreach (var otherEntity in others)
                         {
                             var otherEntry = stateManager.TryGetEntry(otherEntity, skipNavigation.Inverse.DeclaringEntityType);
-                            if (otherEntry != null)
+                            if (otherEntry != null
+                                && otherEntry.EntityState != EntityState.Deleted)
                             {
-                                FindAssociationEntry(entry, otherEntry, skipNavigation)?.SetEntityState(EntityState.Deleted);
-                                RemoveFromCollection(entry, skipNavigation, otherEntry);
-
                                 if (skipNavigation.Inverse.IsCollection)
                                 {
                                     RemoveFromCollection(otherEntry, skipNavigation.Inverse, entry);
@@ -867,7 +862,15 @@ private void InitialFixup(
 
                                     if (associationEntry.EntityState == EntityState.Detached)
                                     {
-                                        associationEntry.SetEntityState(EntityState.Added);
+                                        try
+                                        {
+                                            _inFixup = false;
+                                            associationEntry.SetEntityState(EntityState.Added);
+                                        }
+                                        finally
+                                        {
+                                            _inFixup = true;
+                                        }
                                     }
 
                                     if (skipNavigation.Inverse.IsCollection)
@@ -912,7 +915,15 @@ private void DelayedFixup(
 
                     if (associationEntry.EntityState == EntityState.Detached)
                     {
-                        associationEntry.SetEntityState(EntityState.Added);
+                        try
+                        {
+                            _inFixup = false;
+                            associationEntry.SetEntityState(EntityState.Added);
+                        }
+                        finally
+                        {
+                            _inFixup = true;
+                        }
                     }
 
                     AddToCollection(referencedEntry, skipNavigation.Inverse, entry, fromQuery);
@@ -1180,13 +1191,11 @@ private void ConditionallyNullForeignKeyProperties(
                     case EntityState.Added:
                         dependentEntry.SetEntityState(EntityState.Detached);
                         DeleteFixup(dependentEntry);
-                        DeleteSkipNavigationFixup(dependentEntry);
                         break;
                     case EntityState.Unchanged:
                     case EntityState.Modified:
                         dependentEntry.SetEntityState(EntityState.Deleted);
                         DeleteFixup(dependentEntry);
-                        DeleteSkipNavigationFixup(dependentEntry);
                         break;
                 }
             }

diff --git a/src/EFCore/ChangeTracking/Internal/StateManager.cs b/src/EFCore/ChangeTracking/Internal/StateManager.cs
@@ -242,17 +242,20 @@ public virtual InternalEntityEntry GetOrCreateEntry(object entity, IEntityType e
             var entry = TryGetEntry(entity, entityType);
             if (entry == null)
             {
-                var runtimeEntityType = _model.FindRuntimeEntityType(entity.GetType());
-                if (runtimeEntityType != null)
+                if (!entityType.HasSharedClrType)
                 {
-                    if (!entityType.IsAssignableFrom(runtimeEntityType))
+                    var runtimeEntityType = _model.FindRuntimeEntityType(entity.GetType());
+                    if (runtimeEntityType != null)
                     {
-                        throw new InvalidOperationException(
-                            CoreStrings.TrackingTypeMismatch(
-                                runtimeEntityType.DisplayName(), entityType.DisplayName()));
-                    }
+                        if (!entityType.IsAssignableFrom(runtimeEntityType))
+                        {
+                            throw new InvalidOperationException(
+                                CoreStrings.TrackingTypeMismatch(
+                                    runtimeEntityType.DisplayName(), entityType.DisplayName()));
+                        }
 
-                    entityType = runtimeEntityType;
+                        entityType = runtimeEntityType;
+                    }
                 }
 
                 if (entityType.FindPrimaryKey() == null)

diff --git a/test/EFCore.InMemory.FunctionalTests/ManyToManyTrackingInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/ManyToManyTrackingInMemoryTest.cs
@@ -25,6 +25,8 @@ protected override void ExecuteWithStrategyInTransaction(
             Fixture.Reseed();
         }
 
+        protected override bool SupportsDatabaseDefaults => false;
+
         public class ManyToManyTrackingInMemoryFixture : ManyToManyTrackingFixtureBase
         {
             protected override ITestStoreFactory TestStoreFactory => InMemoryTestStoreFactory.Instance;