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

- 修复 HzyTuple 嵌套解析问题；#1390

Browse Source
This commit is contained in:
2881099
2022-12-30 11:31:54 +08:00
parent 0ea8cbad8e
commit 4cd57a0afa
3 changed files with 128 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FreeSql/Internal/CommonExpression.cs
View File

@ -2320,12 +2320,14 @@ namespace FreeSql.Internal
{
private List<SelectTableInfo> tables;
private ParameterExpression[] parameters;
private ParameterExpression lambdaHzyParameter;
public LambdaExpression Modify(LambdaExpression lambda, List<SelectTableInfo> tables)
{
this.tables = tables.Where(a => a.Type != SelectTableInfoType.Parent).ToList();
parameters = this.tables.Select(a => a.Parameter ??
Expression.Parameter(a.Table.Type,
a.Alias.StartsWith("SP10") ? a.Alias.Replace("SP10", "ht") : a.Alias)).ToArray();
lambdaHzyParameter = lambda.Parameters.FirstOrDefault();
var exp = Visit(lambda.Body);
return Expression.Lambda(exp, parameters);
}
@ -2338,6 +2340,7 @@ namespace FreeSql.Internal
var parent = node.Expression as MemberExpression;
if (parent.Expression?.NodeType == ExpressionType.Parameter &&
parent.Expression.Type.Name.StartsWith("HzyTuple`") == true &&
parent.Expression == lambdaHzyParameter &&
int.TryParse(parent.Member.Name.Replace("t", ""), out widx) && widx > 0 && widx <= tables.Count)
{
if (parameters[widx - 1].Type != parent.Type) //解决 BaseEntity + AsTable 时报错
@ -2348,6 +2351,7 @@ namespace FreeSql.Internal
if (node.Expression?.NodeType == ExpressionType.Parameter &&
node.Expression.Type.Name.StartsWith("HzyTuple`") == true &&
node.Expression == lambdaHzyParameter &&
int.TryParse(node.Member.Name.Replace("t", ""), out widx) && widx > 0 && widx <= tables.Count)
{
if (parameters[widx - 1].Type != node.Type) //解决 BaseEntity + AsTable 时报错