Skip to content

Fix duplicate JSON column in TPT child tables for complex types declared on base entity type #37958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+46 −0
Draft

Fix duplicate JSON column in TPT child tables for complex types declared on base entity type #37958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a7ef9
Initial plan
Copilot Mar 19, 2026
8dd1b4e
Fix duplicate JSON column in TPT child tables for complex types decla…
Copilot Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/EFCore.Relational/Metadata/Internal/RelationalModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,23 @@ private static void CreateTableMapping(

foreach (var complexProperty in mappedType.GetComplexProperties())
{
// For TPT: skip complex properties declared on base entity types that have their own table.
// Those complex properties will be processed when mapping the declaring entity type's own table.
// For TPC, all properties (including inherited) must be included in each concrete table, so skip this check.
if (mappedType is IEntityType mappedEntityType
&& mappedEntityType.GetMappingStrategy() != RelationalAnnotationNames.TpcMappingStrategy
&& complexProperty.DeclaringType is IEntityType complexPropertyDeclaringEntityType
&& complexPropertyDeclaringEntityType != mappedEntityType)
{
var declaringTableName = complexPropertyDeclaringEntityType.GetTableName();
if (declaringTableName != null
&& (declaringTableName != mappedTable.Name
|| complexPropertyDeclaringEntityType.GetSchema() != mappedTable.Schema))
{
continue;
}
}

var complexType = complexProperty.ComplexType;

var complexTableMappings =
Expand Down
29 changes: 29 additions & 0 deletions test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3322,6 +3322,27 @@ public void Complex_property_json_column_is_nullable_in_TPH_hierarchy()
Assert.IsType<JsonColumn>(jsonColumn);
}

[ConditionalFact]
public void Complex_property_json_column_is_not_duplicated_in_TPT_child_tables()
{
var modelBuilder = CreateConventionModelBuilder();

modelBuilder.Entity<TptBaseEntityWithComplexProperty>()
.UseTptMappingStrategy()
.ComplexProperty(e => e.ComplexProperty, b => b.ToJson());
modelBuilder.Entity<TptDerivedEntityWithoutComplexProperty>();

var model = modelBuilder.FinalizeModel();
var relationalModel = model.GetRelationalModel();

var baseTable = relationalModel.Tables.Single(t => t.Name == nameof(TptBaseEntityWithComplexProperty));
var childTable = relationalModel.Tables.Single(t => t.Name == nameof(TptDerivedEntityWithoutComplexProperty));

// The JSON column for the base complex property must appear only in the base table
Assert.Contains(baseTable.Columns, c => c.Name == nameof(TptBaseEntityWithComplexProperty.ComplexProperty));
Assert.DoesNotContain(childTable.Columns, c => c.Name == nameof(TptBaseEntityWithComplexProperty.ComplexProperty));
}

[ConditionalFact]
public void Can_use_relational_model_with_functions_and_json_owned_types()
{
Expand Down Expand Up @@ -3497,6 +3518,14 @@ private class TphEntityWithComplexProperty : TphBaseEntity
public ComplexData ComplexProperty { get; set; }
}

private abstract class TptBaseEntityWithComplexProperty
{
public int Id { get; set; }
public ComplexData ComplexProperty { get; set; }
}

private class TptDerivedEntityWithoutComplexProperty : TptBaseEntityWithComplexProperty;

[ComplexType]
private class ComplexData
{
Expand Down