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

- 修复 分组查询后，无法使用子查询的问题；

Browse Source
This commit is contained in:
2881099
2020-12-11 22:03:02 +08:00
parent 2401f7a9e3
commit bfb59d9d39
7 changed files with 200 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
FreeSql/Internal/CommonExpression.cs
View File

@ -18,6 +18,10 @@ namespace FreeSql.Internal
{
public abstract class BaseDiyMemberExpression
{
/// <summary>
/// 临时 LambdaExpression.Parameter
/// </summary>
public ParameterExpression _lambdaParameter;
public ReadAnonymousTypeInfo _map;
public string _field;
public abstract string ParseExp(Expression[] members);
@ -676,6 +680,7 @@ namespace FreeSql.Internal
static ConcurrentDictionary<Type, bool> _dicTypeExistsExpressionCallAttribute = new ConcurrentDictionary<Type, bool>();
static ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>> _dicMethodExistsExpressionCallAttribute = new ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>>();
static ConcurrentDictionary<Type, FieldInfo[]> _dicTypeExpressionCallClassContextFields = new ConcurrentDictionary<Type, FieldInfo[]>();
static ThreadLocal<List<BaseDiyMemberExpression>> _subSelectParentDiyMemExps = new ThreadLocal<List<BaseDiyMemberExpression>>(); //子查询的所有父自定义查询，比如分组之后的子查询
public string ExpressionLambdaToSql(Expression exp, ExpTSC tsc)
{
if (exp == null) return "";
@ -982,14 +987,20 @@ namespace FreeSql.Internal
fsqltables = fsqlSelect0._tables;
//fsqltables[0].Alias = $"{tsc._tables[0].Alias}_{fsqltables[0].Alias}";
if (fsqltables != tsc._tables)
fsqltables.AddRange(tsc._tables.Select(a => new SelectTableInfo
{
if (tsc._tables == null && tsc.diymemexp == null) throw new NotSupportedException($"这个特别的子查询不能解析"); //2020-12-11 IUpdate 条件不支持子查询
if (tsc._tables != null) //groupby is null
{
Alias = a.Alias,
On = "1=1",
Table = a.Table,
Type = SelectTableInfoType.Parent,
Parameter = a.Parameter
}));
fsqltables.AddRange(tsc._tables.Select(a => new SelectTableInfo
{
Alias = a.Alias,
On = "1=1",
Table = a.Table,
Type = SelectTableInfoType.Parent,
Parameter = a.Parameter
}));
}
}
if (tsc.whereGlobalFilter?.Any() == true)
{
var fsqlGlobalFilter = fsqlSelect0._whereGlobalFilter;
@ -1030,7 +1041,28 @@ namespace FreeSql.Internal
//if (args[a] == null) ExpressionLambdaToSql(call3Exp.Arguments[a], fsqltables, null, null, SelectTableInfoType.From, true);
}
}
method.Invoke(fsql, args);
var isSubSelectPdme = tsc._tables == null && tsc.diymemexp != null;
try
{
if (isSubSelectPdme)
{
if (_subSelectParentDiyMemExps.Value == null) _subSelectParentDiyMemExps.Value = new List<BaseDiyMemberExpression>();
_subSelectParentDiyMemExps.Value.Add(tsc.diymemexp);
}
method.Invoke(fsql, args);
}
finally
{
if (isSubSelectPdme)
{
var psgpdmes = _subSelectParentDiyMemExps.Value;
if (psgpdmes != null)
{
psgpdmes.RemoveAt(psgpdmes.Count - 1);
if (psgpdmes.Count == 0) _subSelectParentDiyMemExps.Value = null;
}
}
}
}
if (fsql == null) asSelectBefores.Push(exp3tmp);
}
@ -1302,6 +1334,16 @@ namespace FreeSql.Internal
var expText = tsc.diymemexp.ParseExp(expStack.Where((a, b) => b >= bidx).ToArray());
if (string.IsNullOrEmpty(expText) == false) return expText;
}
var psgpdymes = _subSelectParentDiyMemExps.Value; //解决：分组之后的子查询解析
if (psgpdymes?.Any() == true)
{
var expStackFirst = expStack.First();
if (expStackFirst.NodeType == ExpressionType.Parameter)
{
var expText = psgpdymes.Where(a => a._lambdaParameter == expStackFirst).FirstOrDefault()?.ParseExp(expStack.Where((a, b) => b >= 2).ToArray());
if (string.IsNullOrEmpty(expText) == false) return expText;
}
}
if (tsc._tables == null)
{

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

@ -142,7 +142,11 @@ namespace FreeSql.Internal.CommonProvider
public SelectGroupingProvider(IFreeSql orm, Select0Provider select, ReadAnonymousTypeInfo map, string field, CommonExpression comonExp, List<SelectTableInfo> tables)
:base(orm, select, map, field, comonExp, tables) { }
public string ToSql<TReturn>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TReturn>> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) => InternalToSql(select, fieldAlias);
public string ToSql<TReturn>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TReturn>> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex)
{
_lambdaParameter = select?.Parameters[0];
return InternalToSql(select, fieldAlias);
}
public string ToSql(string field)
{
if (string.IsNullOrEmpty(field))
@ -180,23 +184,34 @@ namespace FreeSql.Internal.CommonProvider
public ISelectGrouping<TKey, TValue> Having(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, bool>> exp)
{
_lambdaParameter = exp?.Parameters[0];
InternalHaving(exp);
return this;
}
public ISelectGrouping<TKey, TValue> OrderBy<TMember>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TMember>> column)
{
_lambdaParameter = column?.Parameters[0];
InternalOrderBy(column, false);
return this;
}
public ISelectGrouping<TKey, TValue> OrderByDescending<TMember>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TMember>> column)
{
_lambdaParameter = column?.Parameters[0];
InternalOrderBy(column, true);
return this;
}
public List<TReturn> Select<TReturn>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TReturn>> select) => ToList(select);
public List<TReturn> ToList<TReturn>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TReturn>> select) => InternalToList(select, typeof(TReturn)) as List<TReturn>;
public Dictionary<TKey, TElement> ToDictionary<TElement>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TElement>> elementSelector) => InternalToKeyValuePairs(elementSelector, typeof(TElement)).ToDictionary(a => (TKey)a.Key, a => (TElement)a.Value);
public List<TReturn> ToList<TReturn>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TReturn>> select)
{
_lambdaParameter = select?.Parameters[0];
return InternalToList(select, typeof(TReturn)) as List<TReturn>;
}
public Dictionary<TKey, TElement> ToDictionary<TElement>(Expression<Func<ISelectGroupingAggregate<TKey, TValue>, TElement>> elementSelector)
{
_lambdaParameter = elementSelector?.Parameters[0];
return InternalToKeyValuePairs(elementSelector, typeof(TElement)).ToDictionary(a => (TKey)a.Key, a => (TElement)a.Value);
}
#if net40
#else
@ -208,6 +223,7 @@ namespace FreeSql.Internal.CommonProvider
var field = new StringBuilder();
var index = 0;
_lambdaParameter = select?.Parameters[0];
_comonExp.ReadAnonymousField(null, field, map, ref index, select, null, this, null, null, false);
if (map.Childs.Any() == false && map.MapType == null) map.MapType = typeof(TReturn);
var method = _select.GetType().GetMethod("ToListMapReaderAsync", BindingFlags.Instance | BindingFlags.NonPublic);
@ -220,6 +236,7 @@ namespace FreeSql.Internal.CommonProvider
var field = new StringBuilder();
var index = 0;
_lambdaParameter = elementSelector?.Parameters[0];
_comonExp.ReadAnonymousField(null, field, map, ref index, elementSelector, null, this, null, null, false);
if (map.Childs.Any() == false && map.MapType == null) map.MapType = typeof(TElement);
var method = _select.GetType().GetMethod("ToListMapReaderPrivateAsync", BindingFlags.Instance | BindingFlags.NonPublic);