Avoid NRE in ForeignKeyAttributeConvention

Fixes #26436
dotnet · Nov 9, 2021 · 32ca7e7 · 32ca7e7
1 parent 62dc53f
commit 32ca7e7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/EFCore/Metadata/Conventions/ForeignKeyAttributeConvention.cs b/src/EFCore/Metadata/Conventions/ForeignKeyAttributeConvention.cs
@@ -345,7 +345,7 @@ var fkPropertiesOnDependentToPrincipal
  }
  }
 
- return newRelationshipBuilder.HasForeignKey(fkPropertiesToSet, fromDataAnnotation: true);
+ return newRelationshipBuilder?.HasForeignKey(fkPropertiesToSet, fromDataAnnotation: true);
  }
 
  private static IConventionForeignKeyBuilder? SplitNavigationsToSeparateRelationships(

diff --git a/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs b/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs
@@ -1105,6 +1105,25 @@ protected class Profile4
  public virtual Login4 User { get; set; }
  }
 
+ [ConditionalFact]
+ public virtual void Required_and_ForeignKey_to_ForeignKey_can_be_overridden()
+ {
+ var modelBuilder = CreateModelBuilder();
+
+ modelBuilder.Entity<Login3>()
+ .HasOne(p => p.Profile)
+ .WithOne(p => p.User)
+ .HasForeignKey<Login3>("ProfileId");
+
+ var model = Validate(modelBuilder);
+
+ var loginFk = GetProperty<Login3>(model, "ProfileId").GetContainingForeignKeys().Single();
+ Assert.True(loginFk.IsRequired); // This will be False after #15898 is fixed
+ Assert.True(loginFk.IsRequiredDependent);
+
+ Assert.False(GetProperty<Profile3>(model, nameof(Profile3.Profile3Id)).IsForeignKey());
+ }
+
  [ConditionalFact]
  public virtual void ForeignKey_to_nothing()
  {