Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 16 additions & 27 deletions src/EFCore/ChangeTracking/Internal/NavigationFixer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1414,39 +1414,28 @@ private void ConditionallyNullForeignKeyProperties(

if (foreignKey.IsRequired
&& hasOnlyKeyProperties
&& dependentEntry.EntityState != EntityState.Detached
&& dependentEntry.EntityState != EntityState.Deleted)
&& dependentEntry.EntityState != EntityState.Detached)
{
if (foreignKey.DeleteBehavior == DeleteBehavior.Cascade
|| foreignKey.DeleteBehavior == DeleteBehavior.ClientCascade
|| foreignKey.IsOwnership)
try
{
try
{
_inFixup = true;
switch (dependentEntry.EntityState)
{
case EntityState.Added:
dependentEntry.SetEntityState(EntityState.Detached);
DeleteFixup(dependentEntry);
break;
case EntityState.Unchanged:
case EntityState.Modified:
dependentEntry.SetEntityState(
dependentEntry.SharedIdentityEntry != null ? EntityState.Detached : EntityState.Deleted);
DeleteFixup(dependentEntry);
break;
}
}
finally
_inFixup = true;
switch (dependentEntry.EntityState)
{
_inFixup = false;
case EntityState.Added:
dependentEntry.SetEntityState(EntityState.Detached);
DeleteFixup(dependentEntry);
break;
case EntityState.Unchanged:
case EntityState.Modified:
dependentEntry.SetEntityState(
dependentEntry.SharedIdentityEntry != null ? EntityState.Detached : EntityState.Deleted);
DeleteFixup(dependentEntry);
break;
}
}
else
finally
{
throw new InvalidOperationException(
CoreStrings.KeyReadOnly(dependentProperties.First().Name, dependentEntry.EntityType.DisplayName()));
_inFixup = false;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2082,7 +2082,7 @@ private static SecondLaw AddSecondLevel(bool thirdLevel1, bool thirdLevel2)
return secondLevel;
}

[ConditionalTheory] // Issue #28961
[ConditionalTheory] // Issue #28961 and Issue #32385
[InlineData(false)]
[InlineData(true)]
public virtual Task Alternate_key_over_foreign_key_doesnt_bypass_delete_behavior(bool async)
Expand All @@ -2096,16 +2096,14 @@ public virtual Task Alternate_key_over_foreign_key_doesnt_bypass_delete_behavior
? await context.SaveChangesAsync()
: context.SaveChanges();

Assert.Equal(
CoreStrings.KeyReadOnly(nameof(SneakyChild.ParentId), nameof(SneakyChild)),
(await Assert.ThrowsAsync<InvalidOperationException>(
async () =>
{
parent.Children.Remove(parent.Children.First());
_ = async
? await context.SaveChangesAsync()
: context.SaveChanges();
})).Message);
Assert.Equal(2, context.ChangeTracker.Entries().Count());

parent.Children.Remove(parent.Children.First());
_ = async
? await context.SaveChangesAsync()
: context.SaveChanges();

Assert.Equal(1, context.ChangeTracker.Entries().Count());
});

[ConditionalTheory] // Issue #30764
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -856,9 +856,7 @@ public virtual void Save_required_one_to_one_changed_by_reference(

if (Fixture.ForceClientNoAction)
{
Assert.Equal(
CoreStrings.KeyReadOnly(nameof(RequiredSingle1.Id), nameof(RequiredSingle1)),
Assert.Throws<InvalidOperationException>(() => context.SaveChanges()).Message);
Assert.Throws<DbUpdateException>(() => context.SaveChanges());
}
else
{
Expand Down Expand Up @@ -1202,11 +1200,13 @@ public virtual void Sever_required_one_to_one(
throw new ArgumentOutOfRangeException(nameof(changeMechanism));
}

Assert.False(context.Entry(root).Reference(e => e.RequiredSingle).IsLoaded);
Assert.False(context.Entry(old1).Reference(e => e.Root).IsLoaded);
Assert.True(context.ChangeTracker.HasChanges());

if (Fixture.ForceClientNoAction)
{
Assert.Equal(
CoreStrings.KeyReadOnly(nameof(RequiredSingle1.Id), nameof(RequiredSingle1)),
Assert.Throws<InvalidOperationException>(() => context.SaveChanges()).Message);
Assert.Throws<DbUpdateException>(() => context.SaveChanges());
}
else
{
Expand Down