Update to never make base-linking FKs ClientCascade.

Author: ajcvickers

src/EFCore.SqlServer/Metadata/Conventions/SqlServerOnDeleteConvention.cs

@@ -57,12 +57,6 @@ protected override DeleteBehavior GetTargetDeleteBehavior(IConventionForeignKey
             return deleteBehavior;
         }
 
-        if (foreignKey.IsBaseLinking()
-            && IsMappedToSameTable(foreignKey.DeclaringEntityType, foreignKey.PrincipalEntityType))
-        {
-            return DeleteBehavior.ClientCascade;
-        }
-
         return ProcessSkipNavigations(foreignKey.GetReferencingSkipNavigations()) ?? deleteBehavior;
     }
 
@@ -105,23 +99,23 @@ protected override DeleteBehavior GetTargetDeleteBehavior(IConventionForeignKey
         DeleteBehavior DefaultDeleteBehavior(IConventionSkipNavigation conventionSkipNavigation)
             => conventionSkipNavigation.ForeignKey!.IsRequired ? DeleteBehavior.Cascade : DeleteBehavior.ClientSetNull;
 
+        bool IsMappedToSameTable(IConventionEntityType entityType1, IConventionEntityType entityType2)
+        {
+            var tableName1 = entityType1.GetTableName();
+            var tableName2 = entityType2.GetTableName();
+
+            return tableName1 != null
+                && tableName2 != null
+                && tableName1 == tableName2
+                && entityType1.GetSchema() == entityType2.GetSchema();
+        }
+
         bool IsFirstSkipNavigation(IConventionSkipNavigation navigation)
             => navigation.DeclaringEntityType != navigation.TargetEntityType
                 ? string.Compare(navigation.DeclaringEntityType.Name, navigation.TargetEntityType.Name, StringComparison.Ordinal) < 0
                 : string.Compare(navigation.Name, navigation.Inverse!.Name, StringComparison.Ordinal) < 0;
     }
 
-    private bool IsMappedToSameTable(IConventionEntityType entityType1, IConventionEntityType entityType2)
-    {
-        var tableName1 = entityType1.GetTableName();
-        var tableName2 = entityType2.GetTableName();
-
-        return tableName1 != null
-            && tableName2 != null
-            && tableName1 == tableName2
-            && entityType1.GetSchema() == entityType2.GetSchema();
-    }
-
     /// <inheritdoc />
     public virtual void ProcessEntityTypeAnnotationChanged(
         IConventionEntityTypeBuilder entityTypeBuilder,

test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs

@@ -832,7 +832,7 @@ public virtual void Entity_splitting_is_stored_in_snapshot_with_tables()
                     b.HasOne(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Order"", null)
                         .WithOne()
                         .HasForeignKey(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Order"", ""Id"")
-                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
                     b.OwnsOne(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+OrderDetails"", ""OrderBillingDetails"", b1 =>
@@ -863,7 +863,7 @@ public virtual void Entity_splitting_is_stored_in_snapshot_with_tables()
                             b1.HasOne(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Order.OrderBillingDetails#Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+OrderDetails"", null)
                                 .WithOne()
                                 .HasForeignKey(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Order.OrderBillingDetails#Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+OrderDetails"", ""OrderId"")
-                                .OnDelete(DeleteBehavior.ClientCascade)
+                                .OnDelete(DeleteBehavior.Cascade)
                                 .IsRequired();
 
                             b1.OwnsOne(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+StreetAddress"", ""StreetAddress"", b2 =>
@@ -912,7 +912,7 @@ public virtual void Entity_splitting_is_stored_in_snapshot_with_tables()
                             b1.HasOne(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Order.OrderShippingDetails#Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+OrderDetails"", null)
                                 .WithOne()
                                 .HasForeignKey(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Order.OrderShippingDetails#Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+OrderDetails"", ""OrderId"")
-                                .OnDelete(DeleteBehavior.ClientCascade)
+                                .OnDelete(DeleteBehavior.Cascade)
                                 .IsRequired();
 
                             b1.OwnsOne(""Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+StreetAddress"", ""StreetAddress"", b2 =>

test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs

@@ -1340,7 +1340,7 @@ public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEnt
             var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty(""PrincipalBaseId"")!, declaringEntityType.FindProperty(""PrincipalBaseAlternateId"")! },
                 principalEntityType.FindKey(new[] { principalEntityType.FindProperty(""PrincipalBaseId"")!, principalEntityType.FindProperty(""PrincipalBaseAlternateId"")! })!,
                 principalEntityType,
-                deleteBehavior: DeleteBehavior.ClientCascade,
+                deleteBehavior: DeleteBehavior.Cascade,
                 unique: true,
                 required: true,
                 requiredDependent: true);