Detect ambigous InversePropertyAttribute on collection navigations. (#…

…33434) Fixes #33327
dotnet · Mar 30, 2024 · b60fd47 · b60fd47
1 parent 6df2608
commit b60fd47
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs b/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs
@@ -630,7 +630,8 @@ public static bool IsAmbiguous(
             {
                 foreach (var (memberInfo, references) in navigationMap.Values)
                 {
-                    if (memberInfo.GetMemberType().IsAssignableFrom(entityType.ClrType)
+                    var memberInfoType = memberInfo.GetMemberType();
+                    if ((memberInfoType.TryGetSequenceType() ?? memberInfoType).IsAssignableFrom(entityType.ClrType)
                         && IsAmbiguousInverse(navigation, entityType, references))
                     {
                         return true;

diff --git a/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs b/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs
@@ -2227,7 +2227,7 @@ public virtual void InversePropertyAttribute_pointing_to_same_skip_nav_on_base_c
     {
         var modelBuilder = CreateModelBuilder();
         modelBuilder.Entity<AmbiguousInversePropertyLeft>();
-        modelBuilder.Entity<AmbiguousInversePropertyLeftDerived>();
+        modelBuilder.Entity<AmbiguousInversePropertyRightDerived>();
 
         Assert.Equal(
             CoreStrings.WarningAsErrorTemplate(
@@ -2249,7 +2249,6 @@ protected class AmbiguousInversePropertyLeft
 
     protected class AmbiguousInversePropertyLeftDerived : AmbiguousInversePropertyLeft
     {
-        public List<AmbiguousInversePropertyRightDerived> DerivedRights { get; set; }
     }
 
     protected class AmbiguousInversePropertyRight
@@ -2771,6 +2770,21 @@ public virtual void InverseProperty_with_case_sensitive_clr_property()
         Validate(modelBuilder);
     }
 
+    [ConditionalFact]
+    public virtual void InverseProperty_with_potentially_ambigous_derived_types()
+    {
+        var modelBuilder = CreateModelBuilder();
+        var model = modelBuilder.Model;
+
+        modelBuilder.Ignore<CPSorder>();
+        modelBuilder.Entity<SpecialOrder>();
+        modelBuilder.Entity<CPSpecialOrder>();
+
+        modelBuilder.Entity<CPSorder>().HasKey(e => e.Id);
+
+        Validate(modelBuilder);
+    }
+
     public abstract class DataAnnotationFixtureBase : SharedStoreFixtureBase<PoolableDbContext>
     {
         protected override string StoreName
@@ -2929,4 +2943,12 @@ protected class Partner
         [InverseProperty(nameof(CPSorder.CPSchargePartner))]
         public virtual ICollection<CPSorder> CPSorders { get; set; }
     }
+
+    protected class SpecialOrder : CPSorder
+    {
+    }
+
+    protected class CPSpecialOrder : CPSorder
+    {
+    }
 }