Merge pull request #37382 from dotnet/Issue37373

[release/10.0] Fix deletion of entities with non-empty complex collection

Fixes #37373
Port of #37377

Author: AndriySvyryd

src/EFCore.Relational/Update/ModificationCommand.cs

@@ -37,6 +37,9 @@ public class ModificationCommand : IModificationCommand, INonTrackedModification
     private EntityState _entityState;
     private readonly IDiagnosticsLogger<DbLoggerCategory.Update>? _logger;
 
+    private static readonly bool UseOldBehavior37373 =
+        AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue37373", out var enabled) && enabled;
+
     /// <summary>
     ///     Initializes a new <see cref="ModificationCommand" /> instance.
     /// </summary>
@@ -288,7 +291,7 @@ private List<IColumnModification> GenerateColumnModifications()
             }
         }
 
-        if (_entries.Any(e => e.EntityType is { } entityType
+        if ((!deleting || UseOldBehavior37373) && _entries.Any(e => e.EntityType is { } entityType
                 && (entityType.IsMappedToJson()
                     || entityType.GetFlattenedComplexProperties().Any(cp => cp.ComplexType.IsMappedToJson())
                     || entityType.GetNavigations().Any(e => e.IsCollection && e.TargetEntityType.IsMappedToJson()))))

test/EFCore.Relational.Specification.Tests/Update/ComplexCollectionJsonUpdateTestBase.cs

@@ -70,6 +70,30 @@ public virtual Task Remove_element_from_complex_collection_mapped_to_json()
                 }
             });
 
+    [ConditionalFact]
+    public virtual Task Delete_complex_collection_owner_entity_mapped_to_json()
+        => TestHelpers.ExecuteWithStrategyInTransactionAsync(
+            CreateContext,
+            UseTransaction,
+            async context =>
+            {
+                var company = await context.Companies.SingleAsync(c => c.Id == 1);
+
+                context.Remove(company);
+
+                ClearLog();
+
+                await context.SaveChangesAsync();
+            },
+            async context =>
+            {
+                using (SuspendRecordingEvents())
+                {
+                    var exists = await context.Companies.AnyAsync(c => c.Id == 1);
+                    Assert.False(exists);
+                }
+            });
+
     [ConditionalFact]
     public virtual Task Modify_element_in_complex_collection_mapped_to_json()
         => TestHelpers.ExecuteWithStrategyInTransactionAsync(

test/EFCore.SqlServer.FunctionalTests/Update/ComplexCollectionJsonUpdateSqlServerTest.cs

@@ -44,6 +44,23 @@ OUTPUT 1
 """);
     }
 
+    public override async Task Delete_complex_collection_owner_entity_mapped_to_json()
+    {
+        await base.Delete_complex_collection_owner_entity_mapped_to_json();
+
+        AssertSql(
+            """
+@p0='1'
+
+SET IMPLICIT_TRANSACTIONS OFF;
+SET NOCOUNT ON;
+DELETE FROM [Companies]
+OUTPUT 1
+WHERE [Id] = @p0;
+""");
+    }
+
+
     public override async Task Modify_element_in_complex_collection_mapped_to_json()
     {
         await base.Modify_element_in_complex_collection_mapped_to_json();