Stop prefixing check constraints.

Fixes #27059
dotnet · Jan 7, 2022 · e2b7133 · e2b7133
1 parent 5f90495
commit e2b7133
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/src/EFCore.Relational/Metadata/IReadOnlyCheckConstraint.cs b/src/EFCore.Relational/Metadata/IReadOnlyCheckConstraint.cs
@@ -50,7 +50,8 @@ string GetDefaultName(in StoreObjectIdentifier storeObject)
         {
             var prefix = $"CK_{storeObject.Name}_";
             return Uniquifier.Truncate(
-                ModelName.StartsWith(prefix, StringComparison.Ordinal)
+                !(AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue27059", out var enabled) && enabled)
+                || ModelName.StartsWith(prefix, StringComparison.Ordinal)
                     ? ModelName
                     : prefix + ModelName,
                 EntityType.Model.GetMaxIdentifierLength());

diff --git a/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs b/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs
@@ -711,7 +711,7 @@ public virtual void CheckConstraint_is_stored_in_snapshot_as_fluent_api()
                 builder =>
                 {
                     builder.Entity<EntityWithTwoProperties>()
-                        .HasCheckConstraint("CK_Customer_AlternateId", "AlternateId > Id", ck => ck.HasName("CK_Customer_AlternateId"));
+                        .HasCheckConstraint("AlternateId", "AlternateId > Id", ck => ck.HasName("CK_Customer_AlternateId"));
                     builder.Ignore<EntityWithOneProperty>();
                 },
                 AddBoilerPlate(
@@ -732,7 +732,7 @@ public virtual void CheckConstraint_is_stored_in_snapshot_as_fluent_api()
 
                     b.ToTable(""EntityWithTwoProperties"");
 
-                    b.HasCheckConstraint(""CK_Customer_AlternateId"", ""AlternateId > Id"", c => c.HasName(""CK_Customer_AlternateId""));
+                    b.HasCheckConstraint(""AlternateId"", ""AlternateId > Id"", c => c.HasName(""CK_Customer_AlternateId""));
                 });"),
                 o =>
                 {

diff --git a/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsTestBase.cs b/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsTestBase.cs
@@ -89,7 +89,7 @@ await Test(
 
                         e.HasKey("CustomId");
                         e.HasAlternateKey("SSN");
-                        e.HasCheckConstraint("EmployerId", $"{DelimitIdentifier("EmployerId")} > 0");
+                        e.HasCheckConstraint("CK_People_EmployerId", $"{DelimitIdentifier("EmployerId")} > 0");
                         e.HasOne("Employers").WithMany("People").HasForeignKey("EmployerId");
 
                         e.HasComment("Table comment");
@@ -641,7 +641,7 @@ public virtual Task Add_column_with_check_constraint()
                     "People", e =>
                     {
                         e.Property<int>("DriverLicense");
-                        e.HasCheckConstraint("Foo", $"{DelimitIdentifier("DriverLicense")} > 0");
+                        e.HasCheckConstraint("CK_People_Foo", $"{DelimitIdentifier("DriverLicense")} > 0");
                     }),
                 model =>
                 {
@@ -1307,7 +1307,7 @@ public virtual Task Add_check_constraint_with_name()
                         e.Property<int>("DriverLicense");
                     }),
                 builder => { },
-                builder => builder.Entity("People").HasCheckConstraint("Foo", $"{DelimitIdentifier("DriverLicense")} > 0"),
+                builder => builder.Entity("People").HasCheckConstraint("CK_People_Foo", $"{DelimitIdentifier("DriverLicense")} > 0"),
                 model =>
                 {
                     // TODO: no scaffolding support for check constraints, https://github.com/aspnet/EntityFrameworkCore/issues/15408
@@ -1322,8 +1322,8 @@ public virtual Task Alter_check_constraint()
                         e.Property<int>("Id");
                         e.Property<int>("DriverLicense");
                     }),
-                builder => builder.Entity("People").HasCheckConstraint("Foo", $"{DelimitIdentifier("DriverLicense")} > 0"),
-                builder => builder.Entity("People").HasCheckConstraint("Foo", $"{DelimitIdentifier("DriverLicense")} > 1"),
+                builder => builder.Entity("People").HasCheckConstraint("CK_People_Foo", $"{DelimitIdentifier("DriverLicense")} > 0"),
+                builder => builder.Entity("People").HasCheckConstraint("CK_People_Foo", $"{DelimitIdentifier("DriverLicense")} > 1"),
                 model =>
                 {
                     // TODO: no scaffolding support for check constraints, https://github.com/aspnet/EntityFrameworkCore/issues/15408
@@ -1338,7 +1338,7 @@ public virtual Task Drop_check_constraint()
                         e.Property<int>("Id");
                         e.Property<int>("DriverLicense");
                     }),
-                builder => builder.Entity("People").HasCheckConstraint("Foo", $"{DelimitIdentifier("DriverLicense")} > 0"),
+                builder => builder.Entity("People").HasCheckConstraint("CK_People_Foo", $"{DelimitIdentifier("DriverLicense")} > 0"),
                 builder => { },
                 model =>
                 {

diff --git a/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs b/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs
@@ -475,9 +475,9 @@ public virtual void Passes_for_incompatible_uniquified_check_constraints_with_sh
             var modelBuilder = CreateConventionalModelBuilder();
 
             modelBuilder.Entity<A>().HasOne<B>().WithOne(b => b.A).HasForeignKey<A>(a => a.Id).HasPrincipalKey<B>(b => b.Id).IsRequired();
-            modelBuilder.Entity<A>().HasCheckConstraint("SomeCK", "Id > 0");
+            modelBuilder.Entity<A>().HasCheckConstraint("CK_Table_SomeCK", "Id > 0");
             modelBuilder.Entity<A>().ToTable("Table");
-            modelBuilder.Entity<B>().HasCheckConstraint("SomeCK", "Id > 10");
+            modelBuilder.Entity<B>().HasCheckConstraint("CK_Table_SomeCK", "Id > 10");
             modelBuilder.Entity<B>().ToTable("Table");
 
             var model = Validate(modelBuilder);
@@ -492,9 +492,9 @@ public virtual void Passes_for_compatible_shared_check_constraints_with_shared_t
             var modelBuilder = CreateConventionalModelBuilder();
 
             modelBuilder.Entity<A>().HasOne<B>().WithOne(b => b.A).HasForeignKey<A>(a => a.Id).HasPrincipalKey<B>(b => b.Id).IsRequired();
-            modelBuilder.Entity<A>().HasCheckConstraint("SomeCK", "Id > 0");
+            modelBuilder.Entity<A>().HasCheckConstraint("CK_Table_SomeCK", "Id > 0");
             modelBuilder.Entity<A>().ToTable("Table");
-            modelBuilder.Entity<B>().HasCheckConstraint("SomeCK", "Id > 0");
+            modelBuilder.Entity<B>().HasCheckConstraint("CK_Table_SomeCK", "Id > 0");
             modelBuilder.Entity<B>().ToTable("Table");
 
             var model = Validate(modelBuilder);

diff --git a/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderGenericTest.cs b/test/EFCore.SqlServer.Tests/ModelBuilding/SqlServerModelBuilderGenericTest.cs
@@ -338,10 +338,10 @@ public void Can_add_check_constraints()
                 var modelBuilder = CreateModelBuilder();
                 modelBuilder.Entity<Child>()
                     .HasBaseType(null)
-                    .HasCheckConstraint("LargeId", "Id > 1000", c => c.HasName("CK_LargeId"));
+                    .HasCheckConstraint("CK_Child_LargeId", "Id > 1000", c => c.HasName("CK_LargeId"));
                 modelBuilder.Entity<ChildBase>()
                     .HasCheckConstraint("PositiveId", "Id > 0")
-                    .HasCheckConstraint("LargeId", "Id > 1000");
+                    .HasCheckConstraint("CK_ChildBase_LargeId", "Id > 1000");
                 modelBuilder.Entity<Child>()
                     .HasBaseType<ChildBase>();
                 modelBuilder.Entity<DisjointChildSubclass1>();