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

FieldAliasOptions 新增空的别名,解决CountDistinct 问题

Browse Source
This commit is contained in:
gaoyong101 2024-06-27 14:32:10 +08:00
parent f1fd00340d
commit fe00dd8075
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FreeSql/FreeSql.xml
View File

@ -2055,6 +2055,11 @@
使用属性名作为字段别名
</summary>
</member>
<member name="F:FreeSql.FieldAliasOptions.AsEmpty">
<summary>
没有别名
</summary>
</member>
<member name="M:FreeSql.ISelect0`2.Cancel(System.Func{System.Boolean})">
<summary>
控制取消本次查询<para></para>

7
FreeSql/Interface/Curd/ISelect/FieldAliasOptions.cs
View File

@ -17,6 +17,11 @@ namespace FreeSql
/// <summary>
/// 使用属性名作为字段别名
/// </summary>
AsProperty
AsProperty,
/// <summary>
/// 没有字段别名
/// </summary>
AsEmpty,
}
}

7
FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
View File

@ -443,7 +443,8 @@ namespace FreeSql.Internal.CommonProvider
{
var map = new ReadAnonymousTypeInfo();
var field = new StringBuilder();
var index = fieldAlias == FieldAliasOptions.AsProperty ? CommonExpression.ReadAnonymousFieldAsCsName : 0;
var index = fieldAlias == FieldAliasOptions.AsProperty ? CommonExpression.ReadAnonymousFieldAsCsName :
(fieldAlias == FieldAliasOptions.AsIndex ? 0 : CommonExpression.ReadAnonymousFieldAsCsNameGroupBy);
_commonExpression.ReadAnonymousField(_tables, _tableRule, field, map, ref index, newexp, this, _diymemexpWithTempQuery, _whereGlobalFilter, null, null, true);
return new ReadAnonymousTypeAfInfo(map, field.Length > 0 ? field.Remove(0, 2).ToString() : null);
@ -1362,7 +1363,7 @@ namespace FreeSql.Internal.CommonProvider
try
{
var countField = "1";
if (tmpDistinct && _selectExpression != null) countField = $"distinct {this.GetExpressionField(_selectExpression, FieldAliasOptions.AsProperty).field}";
if (tmpDistinct && _selectExpression != null) countField = $"distinct {this.GetExpressionField(_selectExpression, FieldAliasOptions.AsEmpty).field}";
return this.ToList<int>($"count({countField}){_commonUtils.FieldAsAlias("as1")}").Sum(); //这里的 Sum 为了分表查询
}
finally
@ -1425,7 +1426,7 @@ namespace FreeSql.Internal.CommonProvider
try
{
var countField = "1";
if (tmpDistinct && _selectExpression != null) countField = $"distinct {this.GetExpressionField(_selectExpression, FieldAliasOptions.AsProperty).field}";
if (tmpDistinct && _selectExpression != null) countField = $"distinct {this.GetExpressionField(_selectExpression, FieldAliasOptions.AsEmpty).field}";
return (await this.ToListAsync<int>($"count({countField}){_commonUtils.FieldAsAlias("as1")}", cancellationToken)).Sum(); //这里的 Sum 为了分表查询
}
finally