Uniquify index names across all tables

Fixes #15425
dotnet · Aug 8, 2019 · 86705a4 · 86705a4
1 parent af721db
commit 86705a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/EFCore.Relational/Metadata/Conventions/SharedTableConvention.cs b/src/EFCore.Relational/Metadata/Conventions/SharedTableConvention.cs
@@ -56,7 +56,6 @@ public virtual void ProcessModelFinalized(IConventionModelBuilder modelBuilder,
  columns.Clear();
  keys.Clear();
  foreignKeys.Clear();
- indexes.Clear();
 
  foreach (var entityType in entityTypes)
  {

diff --git a/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/UpdatesSqlServerTest.cs
@@ -79,14 +79,18 @@ public override void Identifiers_are_generated_correctly()
  Assert.Equal(
  "LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkin~1",
  entityType2.GetTableName());
-
+ Assert.Equal(
+ "PK_LoginDetails",
+ entityType2.GetKeys().Single().GetName());
  Assert.Equal(
  "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingCo~",
  entityType2.GetProperties().ElementAt(1).GetColumnName());
-
  Assert.Equal(
  "ExtraPropertyWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWorkingC~1",
  entityType2.GetProperties().ElementAt(2).GetColumnName());
+ Assert.Equal(
+ "IX_LoginEntityTypeWithAnExtremelyLongAndOverlyConvolutedNameThatIsUsedToVerifyThatTheStoreIdentifierGenerationLengthLimitIsWor~1",
+ entityType2.GetIndexes().Single().GetName());
  }
  }