- 优化 MySql CodeFirst 索引的建立；#498

dotnetcore · Oct 22, 2020 · 1fc4c9c · 1fc4c9c
1 parent 698ace9
commit 1fc4c9c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net452'">
-    <PackageReference Include="MySql.Data" Version="8.0.22" />
+    <PackageReference Include="MySql.Data" Version="8.0.21" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net40'">

diff --git a/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs b/Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs
@@ -151,25 +151,25 @@ protected override string GetComparisonDDLStatements(params TypeAndName[] object
                                 foreach (var tbcol in tb.Primarys) sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
                                 sb.Remove(sb.Length - 2, 2).Append("),");
                             }
-                            sb.Remove(sb.Length - 1, 1);
-                            sb.Append("\r\n) Engine=InnoDB");
-                            if (string.IsNullOrEmpty(tb.Comment) == false)
-                                sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
-                            sb.Append(";\r\n");
-                            //创建表的索引
+                            //创建表的索引，感谢 @mafeng8，这样写可以支持自增不是主键的情况
                             foreach (var uk in tb.Indexes)
                             {
-                                sb.Append("CREATE ");
+                                sb.Append(" \r\n  ");
                                 if (uk.IsUnique) sb.Append("UNIQUE ");
-                                sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1]))).Append(" ON ").Append(createTableName).Append("(");
+                                sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1]))).Append("(");
                                 foreach (var tbcol in uk.Columns)
                                 {
                                     sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
                                     if (tbcol.IsDesc) sb.Append(" DESC");
                                     sb.Append(", ");
                                 }
-                                sb.Remove(sb.Length - 2, 2).Append(");\r\n");
+                                sb.Remove(sb.Length - 2, 2).Append("),");
                             }
+                            sb.Remove(sb.Length - 1, 1);
+                            sb.Append("\r\n) Engine=InnoDB");
+                            if (string.IsNullOrEmpty(tb.Comment) == false)
+                                sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
+                            sb.Append(";\r\n");
                             continue;
                         }
                         //如果新表，旧表在一个数据库下，直接修改表名

diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlCodeFirst.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlCodeFirst.cs
@@ -140,25 +140,25 @@ protected override string GetComparisonDDLStatements(params TypeAndName[] object
                                 foreach (var tbcol in tb.Primarys) sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
                                 sb.Remove(sb.Length - 2, 2).Append("),");
                             }
-                            sb.Remove(sb.Length - 1, 1);
-                            sb.Append("\r\n) Engine=InnoDB");
-                            if (string.IsNullOrEmpty(tb.Comment) == false)
-                                sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
-                            sb.Append(";\r\n");
-                            //创建表的索引
+                            //创建表的索引，感谢 @mafeng8，这样写可以支持自增不是主键的情况
                             foreach (var uk in tb.Indexes)
                             {
-                                sb.Append("CREATE ");
+                                sb.Append(" \r\n  ");
                                 if (uk.IsUnique) sb.Append("UNIQUE ");
-                                sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1]))).Append(" ON ").Append(createTableName).Append("(");
+                                sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1]))).Append("(");
                                 foreach (var tbcol in uk.Columns)
                                 {
                                     sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
                                     if (tbcol.IsDesc) sb.Append(" DESC");
                                     sb.Append(", ");
                                 }
-                                sb.Remove(sb.Length - 2, 2).Append(");\r\n");
+                                sb.Remove(sb.Length - 2, 2).Append("),");
                             }
+                            sb.Remove(sb.Length - 1, 1);
+                            sb.Append("\r\n) Engine=InnoDB");
+                            if (string.IsNullOrEmpty(tb.Comment) == false)
+                                sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
+                            sb.Append(";\r\n");
                             continue;
                         }
                         //如果新表，旧表在一个数据库下，直接修改表名

diff --git a/readme.md b/readme.md
@@ -182,7 +182,8 @@ Elapsed: 00:00:00.6495301; Query Entity Counts: 131072; ORM: Dapper
 [tky753](https://github.com/tky753)、
 [feijie999](https://github.com/feijie999)、
 constantine、
-[JohnZhou2020](https://github.com/JohnZhou2020)
+[JohnZhou2020](https://github.com/JohnZhou2020)、
+[mafeng8](https://github.com/mafeng8)
 
 QQ群：4336577(已满)、8578575(在线)、52508226(在线)