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

- 修复 GroupBy + WithTempQuery 别名问题；

Browse Source
This commit is contained in:
2881099
2024-01-08 08:54:27 +08:00
parent 9cae4c6954
commit 0d2d5175f0
4 changed files with 80 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
View File

@ -20,6 +20,7 @@ namespace FreeSql.Internal.CommonProvider
public List<SelectTableInfo> _tables;
public int _groupByLimit, _groupBySkip;
public bool _addFieldAlias;
public bool _flagNestedFieldAlias;
public SelectGroupingProvider(IFreeSql orm, Select0Provider select, ReadAnonymousTypeInfo map, string field, CommonExpression comonExp, List<SelectTableInfo> tables)
{
@ -53,6 +54,7 @@ namespace FreeSql.Internal.CommonProvider
}
ParseExpMapResult = read;
if (!_addFieldAlias) return read.DbField;
if (_flagNestedFieldAlias) return read.DbField;
if (_comonExp.EndsWithDbNestedField(read.DbField, read.DbNestedField) == false)
{
_ParseExpOnlyDbField.Value = read.DbField;
@ -252,7 +254,8 @@ namespace FreeSql.Internal.CommonProvider
if (ret._tables[0].Table == null) ret._tables[0].Table = TableInfo.GetDefaultTable(typeof(TDto));
Select0Provider.WithTempQueryParser parser = null;
_addFieldAlias = true; //解决：[Column(Name = "flevel") 与属性名不一致时，嵌套查询 bug
var old_field = _field;
_flagNestedFieldAlias = true;//解决重复设置别名问题：.GroupBy((l, p) => new { p.ID, ShopType=l.ShopType??0 }).WithTempQuery(a => new { Money = a.Sum(a.Value.Item1.Amount)* a.Key.ShopType })
var old_field = _field;
var fieldsb = new StringBuilder();
if (_map.Childs.Any() == false) fieldsb.Append(", ").Append(_map.DbField).Append(_comonExp.EndsWithDbNestedField(_map.DbField, _map.DbNestedField) ? "" : _comonExp._common.FieldAsAlias(_map.DbNestedField));
foreach (var child in _map.GetAllChilds())
@ -268,7 +271,8 @@ namespace FreeSql.Internal.CommonProvider
fieldsb.Clear();
_field = old_field;
_addFieldAlias = false;
}
_flagNestedFieldAlias = false;
}
var sql = $"\r\n{this.ToSql(parser._insideSelectList[0].InsideField)}";
ret.WithSql(sql);
ret._diymemexpWithTempQuery = parser;