tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

测试并修复Cilckhouse CodeFirst主键问题

Browse Source
This commit is contained in:
Daily
2024-05-30 10:47:10 +08:00
parent bffc1acba9
commit 54e1ed6fdb
4 changed files with 459 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs
View File

@ -254,25 +254,25 @@ namespace FreeSql.ClickHouse
sb.Append("TYPE set(8192) GRANULARITY 5,");
}
sb.Remove(sb.Length - 1, 1);
//sb.Remove(sb.Length - 1, 1);
if (tb.Primarys.Any())
{
var primaryKeys = string.Join(",", tb.Primarys.Select(p => _commonUtils.QuoteSqlName(p.Attribute.Name)));
sb.Append(" \r\n PRIMARY KEY ");
sb.Append($"( {primaryKeys} ) ");
}
sb.Append("\r\n) ");
sb.Append("\r\nENGINE = MergeTree()");
if (tb.Primarys.Any())
{
sb.Append(" \r\nORDER BY ( ");
var ls = new StringBuilder();
foreach (var tbcol in tb.Primarys)
ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
sb.Append(ls);
sb.Remove(sb.Length - 2, 2);
sb.Append(" )");
sb.Append(" \r\nPRIMARY KEY ");
sb.Append($"({ls}) ");
sb.Remove(sb.Length - 2, 2).Append(",");
var primaryKeys = string.Join(",", tb.Primarys.Select(p => _commonUtils.QuoteSqlName(p.Attribute.Name)));
sb.Append(" \r\nORDER BY ");
sb.Append($"( {primaryKeys} ) ");
}
sb.Remove(sb.Length - 1, 1);
//if (string.IsNullOrEmpty(tb.Comment) == false)
// sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
sb.Append(" SETTINGS index_granularity = 8192;\r\n");
@ -477,16 +477,12 @@ where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
if (tb.Primarys.Any())
{
var primaryKeys = string.Join(",", tb.Primarys.Select(p => _commonUtils.QuoteSqlName(p.Attribute.Name)));
sb.Append(" \r\nORDER BY ( ");
var ls = new StringBuilder();
foreach (var tbcol in tb.Primarys)
ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
sb.Append(ls);
sb.Remove(sb.Length - 2, 2);
sb.Append(primaryKeys);
sb.Append(" )");
sb.Append(" \r\nPRIMARY KEY ");
sb.Append($"({ls}) ");
sb.Remove(sb.Length - 2, 2).Append(",");
sb.Append($"({primaryKeys}) ");
}
sb.Remove(sb.Length - 1, 1);