tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 02:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 删除 MySql CodeFirst 对表字符集的设置；

Browse Source
This commit is contained in:
28810 2019-05-09 11:42:01 +08:00
parent a59ef190d4
commit e63eb42da6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FreeSql.Tests/MySql/MySqlCodeFirstTest.cs
View File

@ -11,21 +11,21 @@ namespace FreeSql.Tests.MySql {
[Fact] [Fact]
public void 中文表_字段() { public void 中文表_字段() {
var sql = g.mysql.CodeFirst.GetComparisonDDLStatements<测试中文表>(); var sql = g.mysql.CodeFirst.GetComparisonDDLStatements<测试中文表2>();
g.mysql.CodeFirst.SyncStructure<测试中文表>(); g.mysql.CodeFirst.SyncStructure<测试中文表2>();
var item = new 测试中文表 { var item = new 测试中文表2 {
标题 = "测试标题", 标题 = "测试标题",
创建时间 = DateTime.Now 创建时间 = DateTime.Now
}; };
Assert.Equal(1, g.mysql.Insert<测试中文表>().AppendData(item).ExecuteAffrows()); Assert.Equal(1, g.mysql.Insert<测试中文表2>().AppendData(item).ExecuteAffrows());
Assert.NotEqual(Guid.Empty, item.编号); Assert.NotEqual(Guid.Empty, item.编号);
var item2 = g.mysql.Select<测试中文表>().Where(a => a.编号 == item.编号).First(); var item2 = g.mysql.Select<测试中文表2>().Where(a => a.编号 == item.编号).First();
Assert.NotNull(item2); Assert.NotNull(item2);
Assert.Equal(item.编号, item2.编号); Assert.Equal(item.编号, item2.编号);
Assert.Equal(item.标题, item2.标题); Assert.Equal(item.标题, item2.标题);
} }
class 测试中文表 { class 测试中文表2 {
[Column(IsPrimary = true)] [Column(IsPrimary = true)]
public Guid 编号 { get; set; } public Guid 编号 { get; set; }
@ -124,7 +124,7 @@ namespace FreeSql.Tests.MySql {
`testFieldEnum2` SET('F1','F2','F3') NOT NULL, `testFieldEnum2` SET('F1','F2','F3') NOT NULL,
`testFieldEnum2Nullable` SET('F1','F2','F3'), `testFieldEnum2Nullable` SET('F1','F2','F3'),
PRIMARY KEY (`Id`) PRIMARY KEY (`Id`)
) Engine=InnoDB CHARACTER SET utf8; ) Engine=InnoDB;
", sql); ", sql);
} }

2
FreeSql.Tests/Oracle/OracleCodeFirstTest.cs
View File

@ -125,7 +125,7 @@ namespace FreeSql.Tests.Oracle {
`Enum2` SET('F1','F2','F3') NOT NULL, `Enum2` SET('F1','F2','F3') NOT NULL,
`Enum2Nullable` SET('F1','F2','F3'), `Enum2Nullable` SET('F1','F2','F3'),
PRIMARY KEY (`Id`) PRIMARY KEY (`Id`)
) Engine=InnoDB CHARACTER SET utf8; ) Engine=InnoDB;
", sql); ", sql);
} }

6
FreeSql/MySql/MySqlCodeFirst.cs
View File

@ -112,7 +112,7 @@ namespace FreeSql.MySql {
var tboldname = tb.DbOldName?.Split(new[] { '.' }, 2); //旧表名 var tboldname = tb.DbOldName?.Split(new[] { '.' }, 2); //旧表名
if (tboldname?.Length == 1) tboldname = new[] { database, tboldname[0] }; if (tboldname?.Length == 1) tboldname = new[] { database, tboldname[0] };
if (string.Compare(tbname[0], database, true) != 0 && ExecuteScalar(database, _commonUtils.FormatSql(" select 1 from pg_database where datname={0}", tbname[0])) == null) //创建数据库 if (string.Compare(tbname[0], database, true) != 0 && ExecuteScalar(database, _commonUtils.FormatSql(" select 1 from information_schema.schemata where schema_name={0}", tbname[0])) == null) //创建数据库
sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0])).Append(" default charset utf8 COLLATE utf8_general_ci;\r\n"); sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0])).Append(" default charset utf8 COLLATE utf8_general_ci;\r\n");
var sbalter = new StringBuilder(); var sbalter = new StringBuilder();
@ -144,7 +144,7 @@ namespace FreeSql.MySql {
sb.Remove(sb.Length - 2, 2).Append("),"); sb.Remove(sb.Length - 2, 2).Append("),");
} }
sb.Remove(sb.Length - 1, 1); sb.Remove(sb.Length - 1, 1);
sb.Append("\r\n) Engine=InnoDB CHARACTER SET utf8;\r\n"); sb.Append("\r\n) Engine=InnoDB;\r\n");
continue; continue;
} }
//如果新表，旧表在一个数据库下，直接修改表名 //如果新表，旧表在一个数据库下，直接修改表名
@ -251,7 +251,7 @@ where a.constraint_schema IN ({0}) and a.table_name IN ({1})", tboldname ?? tbna
sb.Remove(sb.Length - 2, 2).Append("),"); sb.Remove(sb.Length - 2, 2).Append("),");
} }
sb.Remove(sb.Length - 1, 1); sb.Remove(sb.Length - 1, 1);
sb.Append("\r\n) Engine=InnoDB CHARACTER SET utf8;\r\n"); sb.Append("\r\n) Engine=InnoDB;\r\n");
sb.Append("INSERT INTO ").Append(tmptablename).Append(" ("); sb.Append("INSERT INTO ").Append(tmptablename).Append(" (");
foreach (var tbcol in tb.Columns.Values) foreach (var tbcol in tb.Columns.Values)
sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", "); sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");