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

- 优化 子查询的多表使用体验；

Browse Source
This commit is contained in:
2881099
2022-08-15 13:55:00 +08:00
parent 45bbe5f059
commit e5b10704cc
6 changed files with 139 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
FreeSql/Internal/CommonExpression.cs
View File

@ -1083,6 +1083,13 @@ namespace FreeSql.Internal
case "Min": return $"min({ExpressionLambdaToSql(exp3.Arguments[0], tsc)})";
}
}
if (callType.FullName.StartsWith("FreeSql.ISelectGrouping`"))
{
switch (exp3.Method.Name)
{
case "ToList": return "";
}
}
if (callType.FullName.StartsWith("FreeSql.ISelect`"))
{ //子表查询
switch (exp3.Method.Name)
@ -1310,7 +1317,22 @@ namespace FreeSql.Internal
if (_subSelectParentDiyMemExps.Value == null) _subSelectParentDiyMemExps.Value = new List<BaseDiyMemberExpression>();
_subSelectParentDiyMemExps.Value.Add(tsc.diymemexp);
}
method.Invoke(fsql, args);
switch (method.Name)
{
case nameof(ISelect<object>.From):
case nameof(ISelect<object>.FromQuery):
case nameof(ISelect<object>.WithTempQuery):
fsql = method.Invoke(fsql, args);
fsqlType = fsql.GetType();
fsqlSelect0 = fsql as Select0Provider;
if (tsc.dbParams != null) fsqlSelect0._params = tsc.dbParams;
fsqltables = fsqlSelect0._tables;
fsqltable1SetAlias = false;
break;
default:
method.Invoke(fsql, args);
break;
}
}
finally
{
@ -1693,15 +1715,19 @@ namespace FreeSql.Internal
return formatSql(Expression.Lambda(exp).Compile().DynamicInvoke(), tsc.mapType, tsc.mapColumnTmp, tsc.dbParams);
}
if (callExp != null) return ExpressionLambdaToSql(callExp, tsc);
if (tsc.diymemexp != null)
var diymemexps = new[] { tsc.diymemexp, tsc.subSelect001?._diymemexpWithTempQuery };
foreach (var diymemexp in diymemexps)
{
var expStackFirst = expStack.First() as ParameterExpression;
var bidx = expStackFirst.Type.FullName.StartsWith("FreeSql.ISelectGroupingAggregate`") ? 2 : 1; //.Key .Value
var diyexpMembers = expStack.Where((a, b) => b >= bidx).ToArray();
if (diyexpMembers.Any() == false && tsc.diymemexp != null && tsc.diymemexp is Select0Provider.WithTempQueryParser tempQueryParser && tempQueryParser.GetOutsideSelectTable(expStackFirst) != null)
diyexpMembers = expStack.ToArray();
var diyexpResult = tsc.diymemexp.ParseExp(diyexpMembers);
if (string.IsNullOrEmpty(diyexpResult) == false) return diyexpResult;
if (diymemexp != null)
{
var expStackFirst = expStack.First() as ParameterExpression;
var bidx = expStackFirst.Type.FullName.StartsWith("FreeSql.ISelectGroupingAggregate`") ? 2 : 1; //.Key .Value
var diyexpMembers = expStack.Where((a, b) => b >= bidx).ToArray();
if (diyexpMembers.Any() == false && diymemexp != null && diymemexp is Select0Provider.WithTempQueryParser tempQueryParser && tempQueryParser.GetOutsideSelectTable(expStackFirst) != null)
diyexpMembers = expStack.ToArray();
var diyexpResult = diymemexp.ParseExp(diyexpMembers);
if (string.IsNullOrEmpty(diyexpResult) == false) return diyexpResult;
}
}
var psgpdymes = _subSelectParentDiyMemExps.Value; //解决：分组之后的子查询解析
if (psgpdymes?.Any() == true)

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

@ -93,13 +93,22 @@ namespace FreeSql.Internal.CommonProvider
if (lambParms == null)
{
if (to._tables.Count <= from._tables.Count)
to._tables = new List<SelectTableInfo>(from._tables.ToArray());
else
var fromTables = from._tables.Where(a => a.Type == SelectTableInfoType.Parent).ToList();
if (fromTables.Count > 0)
{
to._tables = new List<SelectTableInfo>(to._tables);
for (var a = 0; a < from._tables.Count; a++)
to._tables[a] = from._tables[a];
to._tables.AddRange(fromTables);
}
else
{
if (to._tables.Count <= from._tables.Count)
to._tables = new List<SelectTableInfo>(from._tables.ToArray());
else
{
to._tables = new List<SelectTableInfo>(to._tables);
for (var a = 0; a < from._tables.Count; a++)
to._tables[a] = from._tables[a];
}
}
}
else