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

- 优化 UnionAll + WithTempQuery 嵌套的 SQL；

Browse Source
This commit is contained in:
2881099
2023-11-20 19:17:05 +08:00
parent d204021cf6
commit 1e36bd7822
2 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs
View File

@ -213,11 +213,10 @@ namespace FreeSql.Internal.CommonProvider
public ISelect<T1> UnionAll(params ISelect<T1>[] querys)
{
var sql1 = this.ToSql();
var ret = (_orm as BaseDbProvider).CreateSelectProvider<T1>(null) as Select1Provider<T1>;
var sb = new StringBuilder().Append(this.ToSql());
var sb = new StringBuilder().Append(LocalGetQuerySql(this));
foreach (var select2 in querys)
sb.Append(" \r\nUNION ALL \r\n").Append(select2.ToSql());
sb.Append(" \r\nUNION ALL \r\n").Append(LocalGetQuerySql(select2));
ret.WithSql(sb.ToString());
sb.Clear();
ret._commandTimeout = _commandTimeout;
@ -229,6 +228,17 @@ namespace FreeSql.Internal.CommonProvider
ret._tables[0] = _tables[0];
ret._params = _params;
return ret;
string LocalGetQuerySql(ISelect<T1> query)
{
var query2 = query as Select0Provider;
if (query2._diymemexpWithTempQuery == null ||
query2.IsDefaultSqlContent == false) return query.ToSql();
var sql2 = query2._tableRule(query2._tables[0].Table.Type, null);
if (sql2.StartsWith("(") && sql2.EndsWith(")")) sql2 = sql2.Substring(1, sql2.Length - 2);
if (sql2.StartsWith(" \r\n")) sql2 = sql2.Substring(3);
return sql2;
}
}
public ISelectGrouping<TKey, T1> GroupBy<TKey>(Expression<Func<T1, TKey>> columns)