[release/6.0] Revert change to delete dependent when optional FK with…

… cascade delete is set to null (#27216)
dotnet · Feb 2, 2022 · 0dbe678 · 0dbe678
1 parent ab6e5dc
commit 0dbe678
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/EFCore/ChangeTracking/Internal/NavigationFixer.cs b/src/EFCore/ChangeTracking/Internal/NavigationFixer.cs
@@ -38,6 +38,9 @@ public class NavigationFixer : INavigationFixer
  private readonly bool _useOldBehavior26779
  = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue26779", out var enabled) && enabled;
 
+ private readonly bool _useOldBehavior27174
+ = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue27174", out var enabled) && enabled;
+
  /// <summary>
  /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
  /// the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -504,6 +507,8 @@ var targetDependentEntry
  }
 
  if (newValue == null
+ && (foreignKey.IsRequired
+ || _useOldBehavior27174)
  && (foreignKey.DeleteBehavior == DeleteBehavior.Cascade
  || foreignKey.DeleteBehavior == DeleteBehavior.ClientCascade))
  {

diff --git a/test/EFCore.Tests/ChangeTracking/ChangeTrackerTest.cs b/test/EFCore.Tests/ChangeTracking/ChangeTrackerTest.cs
@@ -1943,7 +1943,7 @@ public void Dependent_FKs_are_not_nulled_when_principal_is_detached(bool delayCa
  }
  }
 
- [ConditionalTheory] // Issues #16546 #25360
+ [ConditionalTheory] // Issues #16546 #25360; Change reverted in #27174.
  [InlineData(false, false, false, true, false)]
  [InlineData(true, false, false, true, false)]
  [InlineData(false, true, false, true, false)]
@@ -2043,7 +2043,8 @@ public void Optional_relationship_with_cascade_still_cascades(
  Assert.Equal(EntityState.Unchanged, context.Entry(attachedContainer).State);
  Assert.Equal(EntityState.Unchanged, context.Entry(attachedTroduct).State);
 
- if (delayCascade)
+ if (delayCascade
+ || (useForeignKey && setProperty))
  {
  Assert.Equal(EntityState.Modified, context.Entry(attachedRoom).State);
  }
@@ -2058,7 +2059,11 @@ public void Optional_relationship_with_cascade_still_cascades(
  Assert.Equal(3, context.ChangeTracker.Entries().Count());
  Assert.Equal(EntityState.Unchanged, context.Entry(attachedContainer).State);
  Assert.Equal(EntityState.Unchanged, context.Entry(attachedTroduct).State);
- Assert.Equal(EntityState.Deleted, context.Entry(attachedRoom).State);
+
+
+ Assert.Equal(
+ useForeignKey && setProperty ? EntityState.Modified : EntityState.Deleted,
+ context.Entry(attachedRoom).State);
 
  context.SaveChanges();
  }