Merge branch 'SqlSugar5' of github.com:donet5/SqlSugar

2 years ago · a32373d00f
2 changed files with 22 additions and 6 deletions
--- a/Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs
@ -234,10 +234,18 @@ namespace SqlSugar
                    {
                        item.IndexName = (this.Context.CurrentConnectionConfig.IndexSuffix+ item.IndexName);
                    }
-                    var database = "{db}";
-                    if (item.IndexName!=null&&item.IndexName.Contains(database)) 
+                    if (item.IndexName != null)
                    {
-                        item.IndexName = item.IndexName.Replace(database, this.Context.Ado.Connection.Database);
+                        var database = "{db}";
+                        if (item.IndexName.Contains(database))
+                        {
+                            item.IndexName = item.IndexName.Replace(database, this.Context.Ado.Connection.Database);
+                        }
+                        var table = "{table}";
+                        if (item.IndexName.Contains(table))
+                        {
+                            item.IndexName = item.IndexName.Replace(table, entityInfo.DbTableName);
+                        }
                    }
                    if (!this.Context.DbMaintenance.IsAnyIndex(item.IndexName))
                    {
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs
@ -234,10 +234,18 @@ namespace SqlSugar
                    {
                        item.IndexName = (this.Context.CurrentConnectionConfig.IndexSuffix+ item.IndexName);
                    }
-                    var database = "{db}";
-                    if (item.IndexName!=null&&item.IndexName.Contains(database)) 
+                    if (item.IndexName != null)
                    {
-                        item.IndexName = item.IndexName.Replace(database, this.Context.Ado.Connection.Database);
+                        var database = "{db}";
+                        if (item.IndexName.Contains(database))
+                        {
+                            item.IndexName = item.IndexName.Replace(database, this.Context.Ado.Connection.Database);
+                        }
+                        var table = "{table}";
+                        if (item.IndexName.Contains(table))
+                        {
+                            item.IndexName = item.IndexName.Replace(table, entityInfo.DbTableName);
+                        }
                    }
                    if (!this.Context.DbMaintenance.IsAnyIndex(item.IndexName))
                    {