Skip to content

Fix HasDiscriminator with default name "Discriminator" failing for non-string types #37785

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

Merged
AndriySvyryd merged 2 commits into from
Feb 25, 2026
+19 −0
Merged

Fix HasDiscriminator with default name "Discriminator" failing for non-string types #37785

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
895bebc
Initial plan
Copilot Feb 24, 2026
53c9b2e
Fix discriminator config source not updated when property name is unc…
Copilot Feb 24, 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
5 changes: 5 additions & 0 deletions src/EFCore/Metadata/Internal/TypeBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,11 @@ public virtual Func<ISnapshot> EmptyShadowValuesFactory
{
if ((string?)this[CoreAnnotationNames.DiscriminatorProperty] == property?.Name)
{
if (property != null)
{
FindAnnotation(CoreAnnotationNames.DiscriminatorProperty)!.UpdateConfigurationSource(configurationSource);
}

return property;
}

Expand Down
14 changes: 14 additions & 0 deletions test/EFCore.Tests/Infrastructure/ModelValidatorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2057,6 +2057,20 @@ public virtual void Detects_missing_non_string_discriminator_values()
VerifyError(CoreStrings.NoDiscriminatorValue(typeof(C).Name), modelBuilder);
}

[ConditionalFact]
public virtual void Does_not_detect_missing_discriminator_values_when_using_default_discriminator_name_with_non_string_type()
{
var modelBuilder = CreateConventionModelBuilder();
modelBuilder.Entity<C>();
modelBuilder.Entity<A>().HasDiscriminator<byte>("Discriminator")
.HasValue<A>(0)
.HasValue<C>(1)
.HasValue<D>(2);
modelBuilder.Entity<D>();

Validate(modelBuilder);
}

[ConditionalFact]
public virtual void Detects_missing_complex_type_discriminator_values()
{
Expand Down
Loading