Also fix result columns

dotnet · Sep 9, 2022 · e42899d · e42899d
1 parent a209e7c
commit e42899d
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/EFCore.Relational/Metadata/Internal/RelationalModel.cs b/src/EFCore.Relational/Metadata/Internal/RelationalModel.cs
@@ -1198,21 +1198,18 @@ private static StoredProcedureMapping CreateStoredProcedureMapping(
                     entityType.GetMappingStrategy() == RelationalAnnotationNames.TphMappingStrategy,
                     "Expected TPH for " + entityType.DisplayName());
 
-                if (entityType.BaseType == null)
+                foreach (var derivedProperty in entityType.GetRootType().GetDerivedProperties())
                 {
-                    foreach (var derivedProperty in entityType.GetDerivedProperties())
+                    if (derivedProperty.Name == resultColumn.PropertyName)
                     {
-                        if (derivedProperty.Name == resultColumn.PropertyName)
-                        {
-                            GetOrCreateStoreStoredProcedureResultColumn(
-                                resultColumn,
-                                derivedProperty,
-                                position,
-                                storeStoredProcedure,
-                                identifier,
-                                relationalTypeMappingSource);
-                            break;
-                        }
+                        GetOrCreateStoreStoredProcedureResultColumn(
+                            resultColumn,
+                            derivedProperty,
+                            position,
+                            storeStoredProcedure,
+                            identifier,
+                            relationalTypeMappingSource);
+                        break;
                     }
                 }