Configure ambiguous navigations with RequiredAttribute

Fixes #24215
dotnet · Aug 27, 2021 · d6e2628 · d6e2628
1 parent a6ad9e5
commit d6e2628
Show file tree

Hide file tree

Showing 5 changed files with 236 additions and 164 deletions.
diff --git a/src/EFCore/Metadata/Conventions/RequiredNavigationAttributeConvention.cs b/src/EFCore/Metadata/Conventions/RequiredNavigationAttributeConvention.cs
@@ -7,6 +7,7 @@
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Metadata.Conventions
 {
@@ -68,16 +69,13 @@ private void ProcessNavigation(IConventionNavigationBuilder navigationBuilder)
                 return;
             }
 
-            if (foreignKey.GetPrincipalEndConfigurationSource() != null)
+            if (navigation.IsOnDependent)
             {
-                if (navigation.IsOnDependent)
-                {
-                    foreignKey.Builder.IsRequired(true, fromDataAnnotation: true);
-                }
-                else
-                {
-                    foreignKey.Builder.IsRequiredDependent(true, fromDataAnnotation: true);
-                }
+                foreignKey.Builder.IsRequired(true, fromDataAnnotation: true);
+            }
+            else
+            {
+                foreignKey.Builder.IsRequiredDependent(true, fromDataAnnotation: true);
             }
         }
 

diff --git a/src/EFCore/Metadata/Internal/ForeignKey.cs b/src/EFCore/Metadata/Internal/ForeignKey.cs
@@ -664,7 +664,7 @@ public virtual bool IsRequired
 
             _isRequiredConfigurationSource = required == null
                 ? null
-                : (ConfigurationSource?)configurationSource.Max(_isRequiredConfigurationSource);
+                : configurationSource.Max(_isRequiredConfigurationSource);
 
             return IsRequired != oldRequired
                 ? DeclaringEntityType.Model.ConventionDispatcher.OnForeignKeyRequirednessChanged(Builder)
@@ -727,7 +727,7 @@ public virtual bool IsRequiredDependent
 
             _isRequiredDependentConfigurationSource = required == null
                 ? null
-                : (ConfigurationSource?)configurationSource.Max(_isRequiredConfigurationSource);
+                : configurationSource.Max(_isRequiredConfigurationSource);
 
             return IsRequiredDependent != oldRequired
                 ? DeclaringEntityType.Model.ConventionDispatcher.OnForeignKeyDependentRequirednessChanged(Builder)