Fix relational overrides validation for non-inheritance case (#23834)

Fixes #23832
dotnet · Jan 8, 2021 · fc29d1c · fc29d1c
1 parent 60ef9cc
commit fc29d1c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/EFCore.Relational/Infrastructure/RelationalModelValidator.cs b/src/EFCore.Relational/Infrastructure/RelationalModelValidator.cs
@@ -1209,7 +1209,7 @@ protected virtual void ValidatePropertyOverrides(
                         switch (storeOverride.StoreObjectType)
                         {
                             case StoreObjectType.Table:
-                                if (!entityType.GetDerivedTypes().Any(
+                                if (!entityType.GetDerivedTypesInclusive().Any(
                                     d =>
                                         d.GetTableName() == name
                                         && d.GetSchema() == schema))
@@ -1222,7 +1222,7 @@ protected virtual void ValidatePropertyOverrides(
 
                                 break;
                             case StoreObjectType.View:
-                                if (!entityType.GetDerivedTypes().Any(
+                                if (!entityType.GetDerivedTypesInclusive().Any(
                                     d =>
                                         d.GetViewName() == name
                                         && d.GetViewSchema() == schema))
@@ -1235,7 +1235,7 @@ protected virtual void ValidatePropertyOverrides(
 
                                 break;
                             case StoreObjectType.SqlQuery:
-                                if (!entityType.GetDerivedTypes().Any(d => d.GetDefaultSqlQueryName() == name))
+                                if (!entityType.GetDerivedTypesInclusive().Any(d => d.GetDefaultSqlQueryName() == name))
                                 {
                                     throw new InvalidOperationException(
                                         RelationalStrings.SqlQueryOverrideMismatch(
@@ -1244,7 +1244,7 @@ protected virtual void ValidatePropertyOverrides(
 
                                 break;
                             case StoreObjectType.Function:
-                                if (!entityType.GetDerivedTypes().Any(d => d.GetFunctionName() == name))
+                                if (!entityType.GetDerivedTypesInclusive().Any(d => d.GetFunctionName() == name))
                                 {
                                     throw new InvalidOperationException(
                                         RelationalStrings.FunctionOverrideMismatch(

diff --git a/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs b/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs
@@ -1881,6 +1881,22 @@ public virtual void Non_TPH_as_a_result_of_DbFunction_throws()
                     TestMethods.MethodFMi.DeclaringType.FullName + "." + TestMethods.MethodFMi.Name + "()", "C"), modelBuilder.Model);
         }
 
+        [ConditionalFact]
+        public virtual void Passes_for_relational_override_without_inheritance()
+        {
+            var modelBuilder = CreateConventionalModelBuilder();
+            modelBuilder.Entity<Person>(
+                e =>
+                {
+                    e.ToTable("foo");
+                    e.Property(p => p.Name).Metadata.SetColumnName("bar", StoreObjectIdentifier.Table("foo", null));
+                });
+
+            Validate(modelBuilder.Model);
+
+            Assert.DoesNotContain(LoggerFactory.Log, l => l.Level == LogLevel.Warning);
+        }
+
         private static void GenerateMapping(IMutableProperty property)
             => property.SetTypeMapping(
                 new TestRelationalTypeMappingSource(