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

- 优化 SqlExt.Sum/Max/Min/Avg 同时支持开窗或普通聚合函数；

Browse Source
This commit is contained in:
28810
2020-09-18 06:35:33 +08:00
parent 39334710b6
commit 0718be2047
4 changed files with 178 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
View File

@ -152,6 +152,7 @@ namespace FreeSql
internal class ExpSbInfo
{
public StringBuilder Sb { get; } = new StringBuilder();
public bool IsOver = false;
public bool IsOrderBy = false;
public bool IsDistinct = false;
}
@ -161,12 +162,13 @@ namespace FreeSql
{
if (expSb.Value == null) expSb.Value = new List<ExpSbInfo>();
expSb.Value.Add(new ExpSbInfo());
expSbLast.Sb.Append(sqlFunc).Append(" ");
expSbLast.Sb.Append(sqlFunc);
return null;
}
public static ISqlOver<TValue> Over<TValue>(this ISqlOver<TValue> that)
{
expSbLast.Sb.Append("over(");
expSbLast.Sb.Append(" over(");
expSbLast.IsOver = true;
return that;
}
public static ISqlOver<TValue> PartitionBy<TValue>(this ISqlOver<TValue> that, object column)
@ -218,9 +220,10 @@ namespace FreeSql
public static TValue ToValue<TValue>(this ISqlOver<TValue> that)
{
var sql = expSbLast.Sb.ToString().TrimEnd(',');
if (expSbLast.IsOver) sql = $"{sql})";
expSbLast.Sb.Clear();
expSb.Value.RemoveAt(expSb.Value.Count - 1);
expContext.Result = $"{sql})";
expContext.Result = sql;
return default;
}
public interface ISqlOver<TValue> { }