Add quirk mode for 23377 and 23354

dotnet · Nov 24, 2020 · f26e828 · f26e828
1 parent b227b1a
commit f26e828
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs b/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs
@@ -153,8 +153,9 @@ public static string GetDefaultSchema([NotNull] this IEntityType entityType)
             }
             else
             {
+                var useOldBehavior = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23377", out var enabled) && enabled;
                 var skipReferencingTypes = entityType.GetForeignKeys().SelectMany(fk => fk.GetReferencingSkipNavigations())
-                    .Where(n => !n.IsOnDependent && n.DeclaringEntityType != entityType)
+                    .Where(n => !n.IsOnDependent && (n.DeclaringEntityType != entityType || useOldBehavior))
                     .ToList();
                 var skipNavigationSchema = skipReferencingTypes.FirstOrDefault()?.DeclaringEntityType.GetSchema();
                 if (skipNavigationSchema != null

diff --git a/src/EFCore.SqlServer/Metadata/Conventions/SqlServerOnDeleteConvention.cs b/src/EFCore.SqlServer/Metadata/Conventions/SqlServerOnDeleteConvention.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -58,10 +59,11 @@ protected override DeleteBehavior GetTargetDeleteBehavior(IConventionForeignKey
                 return deleteBehavior;
             }
 
+            var useOldBehavior = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23354", out var enabled) && enabled;
             if (selfReferencingSkipNavigation
                 == selfReferencingSkipNavigation.DeclaringEntityType.GetDeclaredSkipNavigations()
                     .First(s => s == selfReferencingSkipNavigation || s == selfReferencingSkipNavigation.Inverse)
-                && selfReferencingSkipNavigation != selfReferencingSkipNavigation.Inverse)
+                && (selfReferencingSkipNavigation != selfReferencingSkipNavigation.Inverse || useOldBehavior))
             {
                 selfReferencingSkipNavigation.Inverse.ForeignKey?.Builder.OnDelete(
                     GetTargetDeleteBehavior(selfReferencingSkipNavigation.Inverse.ForeignKey));

diff --git a/src/EFCore/Metadata/Conventions/KeyDiscoveryConvention.cs b/src/EFCore/Metadata/Conventions/KeyDiscoveryConvention.cs
@@ -125,7 +125,8 @@ protected virtual void TryConfigurePrimaryKey([NotNull] IConventionEntityTypeBui
                 var manyToManyForeignKeys = entityType.GetForeignKeys()
                     .Where(fk => fk.GetReferencingSkipNavigations().Any(n => n.IsCollection)).ToList();
                 if (manyToManyForeignKeys.Count == 2
-                    && !manyToManyForeignKeys.Any(fk => fk.PrincipalEntityType == entityType))
+                    && (!manyToManyForeignKeys.Any(fk => fk.PrincipalEntityType == entityType)
+                        || (AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23377", out var enabled) && enabled)))
                 {
                     keyProperties.AddRange(manyToManyForeignKeys.SelectMany(fk => fk.Properties));
                 }