Skip to content

[release/10.0] Always generate HasDiscriminator with type argument and property name in snapshot #37242

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

Open
wants to merge 3 commits into
base: release/10.0
Choose a base branch
from
+66 −13
Open

[release/10.0] Always generate HasDiscriminator with type argument and property name in snapshot #37242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ef2e24
Initial plan
Copilot Nov 26, 2025
529b311
Fix #37143: Always generate HasDiscriminator with generic type argume…
Copilot Nov 26, 2025
ed302cc
Cleanup tests
AndriySvyryd Nov 26, 2025
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
6 changes: 2 additions & 4 deletions src/EFCore.Design/Migrations/Design/CSharpSnapshotGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,7 @@ protected virtual void GenerateComplexPropertyAnnotations(
.Append('.')
.Append("HasDiscriminator");

if (discriminatorProperty.DeclaringType == property.ComplexType
&& discriminatorProperty.Name != "Discriminator")
if (discriminatorProperty.DeclaringType == property.ComplexType)
{
var propertyClrType = FindValueConverter(discriminatorProperty)?.ProviderClrType
.MakeNullable(discriminatorProperty.IsNullable)
Expand Down Expand Up @@ -953,8 +952,7 @@ protected virtual void GenerateEntityTypeAnnotations(
.Append('.')
.Append("HasDiscriminator");

if (discriminatorProperty.DeclaringType == entityType
&& discriminatorProperty.Name != "Discriminator")
if (discriminatorProperty.DeclaringType == entityType)
{
var propertyClrType = FindValueConverter(discriminatorProperty)?.ProviderClrType
.MakeNullable(discriminatorProperty.IsNullable)
Expand Down
73 changes: 64 additions & 9 deletions test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationsGeneratorTest.ModelSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using NetTopologySuite;
using NetTopologySuite.Geometries;
using Xunit.Sdk;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;

// ReSharper disable InconsistentNaming
// ReSharper disable UnusedAutoPropertyAccessor.Local
Expand Down Expand Up @@ -2022,7 +2023,7 @@ public virtual void CheckConstraint_is_only_stored_in_snapshot_once_for_TPH()

b.ToTable("BaseEntity", "DefaultSchema");

b.HasDiscriminator().HasValue("BaseEntity");
b.HasDiscriminator<string>("Discriminator").HasValue("BaseEntity");

b.UseTphMappingStrategy();
});
Expand Down Expand Up @@ -2354,7 +2355,7 @@ public virtual void BaseType_is_stored_in_snapshot()

b.ToTable("BaseEntity", "DefaultSchema");

b.HasDiscriminator().HasValue("BaseEntity");
b.HasDiscriminator<string>("Discriminator").HasValue("BaseEntity");

b.UseTphMappingStrategy();
});
Expand Down Expand Up @@ -2425,7 +2426,7 @@ public virtual void Discriminator_annotations_are_stored_in_snapshot()

b.ToTable("BaseEntity", "DefaultSchema");

b.HasDiscriminator().IsComplete(true).HasValue("BaseEntity");
b.HasDiscriminator<string>("Discriminator").IsComplete(true).HasValue("BaseEntity");

b.UseTphMappingStrategy();
});
Expand Down Expand Up @@ -2500,7 +2501,7 @@ public virtual void Converted_discriminator_annotations_are_stored_in_snapshot()

b.ToTable("BaseEntityWithStructDiscriminator", "DefaultSchema");

b.HasDiscriminator().IsComplete(true).HasValue("Base");
b.HasDiscriminator<string>("Discriminator").IsComplete(true).HasValue("Base");

b.UseTphMappingStrategy();
});
Expand All @@ -2527,13 +2528,18 @@ public virtual void Converted_discriminator_annotations_are_stored_in_snapshot()
"""),
o =>
{
var baseEntityType = o.FindEntityType(typeof(BaseEntityWithStructDiscriminator));
Assert.Equal(
"Discriminator",
o.FindEntityType(typeof(BaseEntityWithStructDiscriminator))[CoreAnnotationNames.DiscriminatorProperty]);
baseEntityType[CoreAnnotationNames.DiscriminatorProperty]);

Assert.Equal(
"Base",
o.FindEntityType(typeof(BaseEntityWithStructDiscriminator))[CoreAnnotationNames.DiscriminatorValue]);
baseEntityType[CoreAnnotationNames.DiscriminatorValue]);

var discriminatorProperty = baseEntityType.FindDiscriminatorProperty();
Assert.Equal(typeof(string), discriminatorProperty.ClrType);
Assert.Equal("Discriminator", discriminatorProperty.Name);

Assert.Equal(
"Another",
Expand Down Expand Up @@ -3375,6 +3381,55 @@ public virtual void Discriminator_of_enum_to_string()
Assert.False(discriminatorProperty.IsNullable);
});

[ConditionalFact]
public virtual void Discriminator_with_non_string_default_name_is_stored_in_snapshot()
=> Test(
builder =>
{
builder.Entity<DerivedType>().HasBaseType<BaseType>();
builder.Entity<BaseType>()
.Ignore(b => b.Navigation)
.HasDiscriminator<int>("Discriminator")
.HasValue<BaseType>(0)
.HasValue<DerivedType>(1);
},
AddBoilerPlate(
GetHeading()
+ """
modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+BaseType", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");

SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));

b.Property<int>("Discriminator")
.HasColumnType("int");

b.HasKey("Id");

b.ToTable("BaseType", "DefaultSchema");

b.HasDiscriminator<int>("Discriminator").HasValue(0);

b.UseTphMappingStrategy();
});

modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+DerivedType", b =>
{
b.HasBaseType("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+BaseType");

b.HasDiscriminator().HasValue(1);
});
"""),
model =>
{
var discriminatorProperty = model.FindEntityType(typeof(BaseType))!.FindDiscriminatorProperty();
Assert.Equal(typeof(int), discriminatorProperty.ClrType);
Assert.Equal("Discriminator", discriminatorProperty.Name);
});

[ConditionalFact]
public virtual void Temporal_table_information_is_stored_in_snapshot()
=> Test(
Expand Down Expand Up @@ -4939,7 +4994,7 @@ public virtual void Property_column_name_is_stored_in_snapshot_when_DefaultColum

b.ToTable("BarBase", "DefaultSchema");

b.HasDiscriminator().HasValue("BarBase");
b.HasDiscriminator<string>("Discriminator").HasValue("BarBase");

b.UseTphMappingStrategy();
});
Expand Down Expand Up @@ -5155,7 +5210,7 @@ public virtual void Property_column_name_on_specific_table_is_stored_in_snapshot

b.ToTable("BaseEntity", "DefaultSchema");

b.HasDiscriminator().HasValue("BaseEntity");
b.HasDiscriminator<string>("Discriminator").HasValue("BaseEntity");

b.UseTphMappingStrategy();
});
Expand Down Expand Up @@ -7718,7 +7773,7 @@ public virtual void Do_not_generate_entity_type_builder_again_if_no_foreign_key_

b.ToTable("BaseType", "DefaultSchema");

b.HasDiscriminator().HasValue("BaseType");
b.HasDiscriminator<string>("Discriminator").HasValue("BaseType");

b.UseTphMappingStrategy();
});
Expand Down