From 62408b2ba710cabbbfa770bd8496fa9e2b276495 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Tue, 28 Feb 2023 18:50:08 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20v3.2.688=20WithTempQue?= =?UTF-8?q?ry=20=E5=9C=BA=E6=99=AF=E7=9A=84=20DTO=20=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeSql/Internal/CommonExpression.cs | 132 ++++++++++++++++----------- 1 file changed, 78 insertions(+), 54 deletions(-) diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs index 2dfda1a8..f2026d8c 100644 --- a/FreeSql/Internal/CommonExpression.cs +++ b/FreeSql/Internal/CommonExpression.cs @@ -330,31 +330,37 @@ namespace FreeSql.Internal { if (diymemexp != null && dtTb.Parameter != null) { - var dbTbExp = MatchDtoProperty(dtTb, dtoProp); - if (dbTbExp?.Any() == true) + var isBreaked = false; + var dbTbExps = MatchDtoPropertys(dtTb, dtoProp); //嵌套查询临时类，可能匹配到多个 DTO + foreach (var dbTbExp in dbTbExps) { - var dbfield = diymemexp.ParseExp(dbTbExp); - if (diymemexp.ParseExpMapResult != null) + if (dbTbExp?.Any() == true) { - var diychild = new ReadAnonymousTypeInfo + var dbfield = diymemexp.ParseExp(dbTbExp); + if (diymemexp.ParseExpMapResult != null) { - Property = dtoProp, - CsName = dtoProp.Name, - CsType = dbTbExp.LastOrDefault().Type, - MapType = dbTbExp.LastOrDefault().Type - }; - parent.Childs.Add(diychild); - diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}"; - diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField; - field.Append(", ").Append(diychild.DbField); - if (index >= 0) - { - diychild.DbNestedField = $"as{++index}"; - field.Append(_common.FieldAsAlias(diychild.DbNestedField)); + var diychild = new ReadAnonymousTypeInfo + { + Property = dtoProp, + CsName = dtoProp.Name, + CsType = dbTbExp.LastOrDefault().Type, + MapType = dbTbExp.LastOrDefault().Type + }; + parent.Childs.Add(diychild); + diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}"; + diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField; + field.Append(", ").Append(diychild.DbField); + if (index >= 0) + { + diychild.DbNestedField = $"as{++index}"; + field.Append(_common.FieldAsAlias(diychild.DbNestedField)); + } + isBreaked = true; + break; } - break; } } + if (isBreaked) break; } continue; } @@ -456,31 +462,37 @@ namespace FreeSql.Internal { if (diymemexp != null && dtTb.Parameter != null) { - var dbTbExp = MatchDtoProperty(dtTb, dtoProp); - if (dbTbExp?.Any() == true) + var isBreaked = false; + var dbTbExps = MatchDtoPropertys(dtTb, dtoProp); //嵌套查询临时类，可能匹配到多个 DTO + foreach (var dbTbExp in dbTbExps) { - var dbfield = diymemexp.ParseExp(dbTbExp); - if (diymemexp.ParseExpMapResult != null) + if (dbTbExp?.Any() == true) { - var diychild = new ReadAnonymousTypeInfo + var dbfield = diymemexp.ParseExp(dbTbExp); + if (diymemexp.ParseExpMapResult != null) { - Property = dtoProp, - CsName = dtoProp.Name, - CsType = dbTbExp.LastOrDefault().Type, - MapType = dbTbExp.LastOrDefault().Type - }; - parent.Childs.Add(diychild); - diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}"; - diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField; - field.Append(", ").Append(diychild.DbField); - if (index >= 0) - { - diychild.DbNestedField = $"as{++index}"; - field.Append(_common.FieldAsAlias(diychild.DbNestedField)); + var diychild = new ReadAnonymousTypeInfo + { + Property = dtoProp, + CsName = dtoProp.Name, + CsType = dbTbExp.LastOrDefault().Type, + MapType = dbTbExp.LastOrDefault().Type + }; + parent.Childs.Add(diychild); + diychild.DbField = $"{dtTb.Alias}.{diymemexp.ParseExpMapResult.DbNestedField}"; + diychild.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField; + field.Append(", ").Append(diychild.DbField); + if (index >= 0) + { + diychild.DbNestedField = $"as{++index}"; + field.Append(_common.FieldAsAlias(diychild.DbNestedField)); + } + isBreaked = true; + break; } - break; } } + if (isBreaked) break; } continue; } @@ -2498,20 +2510,12 @@ namespace FreeSql.Internal //return string.Concat(_ado.AddslashesProcessParam(obj, mapType, mapColumn)); } - public static Expression[] MatchDtoProperty(SelectTableInfo tb, PropertyInfo dtoProp) + public List MatchDtoPropertys(SelectTableInfo tb, PropertyInfo dtoProp) { if (tb == null || dtoProp == null || tb.Parameter == null) return null; - var exp = LocalMatch(tb.Parameter.Type, tb.Parameter); - if (exp == null) return null; - var exps = new Stack(); - while (true) - { - exps.Push(exp); - exp = (exp as MemberExpression).Expression; - if (exp.NodeType == ExpressionType.Parameter) break; - } - if (exps.Any()) return exps.ToArray(); - return null; + var retList = new List(); + LocalMatch(tb.Parameter.Type, tb.Parameter); + return retList; Expression LocalMatch(Type type, Expression memExp) { @@ -2522,14 +2526,34 @@ namespace FreeSql.Internal { foreach (var typeProp in typeProps.Values) { - if (Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(type)) return null; - var nextExp = Expression.MakeMemberAccess(memExp, typeProp); - var ret = LocalMatch(typeProp.PropertyType, nextExp); - if (ret != null) return ret; + if (Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(typeProp.PropertyType)) continue; + if (typeProp.PropertyType.IsAnonymousType() || _common.GetTableByEntity(typeProp.PropertyType)?.Columns.Any() == true) + { + var nextExp = Expression.MakeMemberAccess(memExp, typeProp); + var ret = LocalMatch(typeProp.PropertyType, nextExp); + if (ret != null) + { + var expPath = LocalGetExpressionPath(ret); + if (expPath != null) retList.Add(expPath); + } + } } } return null; } + Expression[] LocalGetExpressionPath(Expression exp) + { + if (exp == null) return null; + var exps = new Stack(); + while (true) + { + exps.Push(exp); + exp = (exp as MemberExpression).Expression; + if (exp.NodeType == ExpressionType.Parameter) break; + } + if (exps.Any()) return exps.ToArray(); + return null; + } } public static void ParseExpressionNoAsSelect(object sender, Aop.ParseExpressionEventArgs e, Func tableRule, List whereGlobalFilter)