Fix foreign key property change when foreign key is no longer in the …

…model (#255) Fixes #251
efcore · Jan 5, 2024 · ea2a909 · ea2a909
1 parent d6f3811
commit ea2a909
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/EFCore.NamingConventions.Test/NameRewritingConventionTest.cs b/EFCore.NamingConventions.Test/NameRewritingConventionTest.cs
@@ -99,13 +99,23 @@ public void Alternative_key()
     }
 
     [Fact]
-    public void Foreign_key()
+    public void Foreign_key_collection_navigation()
     {
         var model = BuildModel(b => b.Entity<Blog>());
         var entityType = model.FindEntityType(typeof(Post))!;
         Assert.Equal("fk_post_blog_blog_id", entityType.GetForeignKeys().Single().GetConstraintName());
     }
 
+    [Fact]
+    public void Foreign_key_reference_navigation()
+    {
+        var model = BuildModel(b => b.Entity<ReferenceNavigationPrincipal>());
+        var entityType = model.FindEntityType(typeof(ReferenceNavigationDependent))!;
+        Assert.Equal(
+            "fk_reference_navigation_dependent_reference_navigation_principal_principal_id",
+            entityType.GetForeignKeys().Single().GetConstraintName());
+    }
+
     [Fact]
     public void Index()
     {
@@ -817,6 +827,19 @@ public class Location
         public double Latitude { get; set; }
     }
 
+    public class ReferenceNavigationPrincipal
+    {
+        public int Id { get; set; }
+        public ReferenceNavigationDependent Dependent { get; set; }
+    }
+
+    public class ReferenceNavigationDependent
+    {
+        public int Id { get; set; }
+        public int PrincipalId { get; set; }
+        public ReferenceNavigationPrincipal Principal { get; set; }
+    }
+
     public class Board
     {
         public int Id { get; }

diff --git a/EFCore.NamingConventions/Internal/NameRewritingConvention.cs b/EFCore.NamingConventions/Internal/NameRewritingConvention.cs
@@ -310,7 +310,7 @@ public void ProcessForeignKeyPropertiesChanged(
         IConventionKey oldPrincipalKey,
         IConventionContext<IReadOnlyList<IConventionProperty>> context)
     {
-        if (relationshipBuilder.Metadata.GetDefaultName() is { } constraintName)
+        if (relationshipBuilder.Metadata.GetDefaultName() is { } constraintName && relationshipBuilder.Metadata.IsInModel)
         {
             relationshipBuilder.HasConstraintName(_namingNameRewriter.RewriteName(constraintName));
         }