Fix #37143: Always generate HasDiscriminator with generic type argument and property name

Co-authored-by: AndriySvyryd <[email protected]>

Author: Copilot

src/EFCore.Design/Migrations/Design/CSharpSnapshotGenerator.cs

@@ -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)
@@ -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)

test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationsGeneratorTest.ModelSnapshot.cs

@@ -547,6 +547,16 @@ private class EntityWithNullableEnumType
         public Days? Day { get; set; }
     }
 
+    private class BaseEntityWithIntDiscriminator
+    {
+        public int Id { get; set; }
+    }
+
+    private class DerivedEntityWithIntDiscriminator : BaseEntityWithIntDiscriminator
+    {
+        public string Name { get; set; }
+    }
+
     private class ManyToManyLeft
     {
         public int Id { get; set; }
@@ -2022,7 +2032,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();
                 });
@@ -2354,7 +2364,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();
                 });
@@ -2425,7 +2435,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();
                 });
@@ -2500,7 +2510,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();
                 });
@@ -3375,6 +3385,57 @@ 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<DerivedEntityWithIntDiscriminator>().HasBaseType<BaseEntityWithIntDiscriminator>();
+                builder.Entity<BaseEntityWithIntDiscriminator>()
+                    .HasDiscriminator<int>("Discriminator")
+                    .HasValue<BaseEntityWithIntDiscriminator>(0)
+                    .HasValue<DerivedEntityWithIntDiscriminator>(1);
+            },
+            AddBoilerPlate(
+                GetHeading()
+                + """
+            modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+BaseEntityWithIntDiscriminator", 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("BaseEntityWithIntDiscriminator", "DefaultSchema");
+
+                    b.HasDiscriminator<int>("Discriminator").HasValue(0);
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+DerivedEntityWithIntDiscriminator", b =>
+                {
+                    b.HasBaseType("Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+BaseEntityWithIntDiscriminator");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasDiscriminator().HasValue(1);
+                });
+"""),
+            model =>
+            {
+                var discriminatorProperty = model.GetEntityTypes().First().FindDiscriminatorProperty();
+                Assert.Equal(typeof(int), discriminatorProperty.ClrType);
+                Assert.Equal("Discriminator", discriminatorProperty.Name);
+            });
+
     [ConditionalFact]
     public virtual void Temporal_table_information_is_stored_in_snapshot()
         => Test(
@@ -4939,7 +5000,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();
                 });
@@ -5155,7 +5216,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();
                 });
@@ -7718,7 +7779,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();
                 });