- 优化子查询中 UnionAll 的解析；

dotnetcore · Nov 4, 2024 · 800640a · 800640a
1 parent 4500ff9
commit 800640a
Show file tree

Hide file tree

Showing 2 changed files with 139 additions and 121 deletions.
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
@@ -1233,6 +1233,8 @@ public string ExpressionLambdaToSql(Expression exp, ExpTSC tsc)
                             var exp3tmp = exp3.Object;
                             if (exp3.Method.Name == "Any" && exp3tmp != null && anyArgs.Any())
                                 exp3Stack.Push(Expression.Call(exp3tmp, callType.GetMethod("Where", anyArgs.Select(a => a.Type).ToArray()), anyArgs.ToArray()));
+                            if (tsc.style == ExpressionStyle.ReturnISelect && typeof(ISelect0).IsAssignableFrom(exp3.Method.ReturnType))
+                                exp3Stack.Push(exp3); //WithTempQuery 或第后一个方法附加到解析或运行，Any/Count/Sum/Min/Max/Avg/ToList/ToOne/First 等方法不需要
                             while (exp3tmp != null)
                             {
                                 exp3Stack.Push(exp3tmp);
@@ -1404,16 +1406,17 @@ public string ExpressionLambdaToSql(Expression exp, ExpTSC tsc)
                                         else if (arg3Exp is NewArrayExpression arg3ExpNewArray && arg3ExpNewArray?.Expressions.Any() == true &&
                                             typeof(ISelect0).IsAssignableFrom(arg3ExpNewArray.Expressions[0].Type))
                                         {
-                                            var arg3ExpNewArrayTables = fsqltables.Select(tbcopy => new SelectTableInfo
-                                            {
-                                                Alias = tbcopy.Alias,
-                                                On = "1=1",
-                                                Table = tbcopy.Table,
-                                                Type = SelectTableInfoType.Parent,
-                                                Parameter = tbcopy.Parameter
-                                            }).ToList();
-                                            args[a] = arg3ExpNewArray.Expressions.Select((b, bi) =>
+                                            Array arg3Values = Array.CreateInstance(arg3ExpNewArray.Expressions[0].Type, arg3ExpNewArray.Expressions.Count);
+                                            for (var arg3Idx = 0;arg3Idx < arg3ExpNewArray.Expressions.Count; arg3Idx++)
                                             {
+                                                var arg3ExpNewArrayTables = fsqltables.Select(tbcopy => new SelectTableInfo
+                                                {
+                                                    Alias = tbcopy.Alias,
+                                                    On = "1=1",
+                                                    Table = tbcopy.Table,
+                                                    Type = SelectTableInfoType.Parent,
+                                                    Parameter = tbcopy.Parameter
+                                                }).ToList();
                                                 var thenTsc = new ExpTSC
                                                 {
                                                     _tables = arg3ExpNewArrayTables,
@@ -1426,9 +1429,10 @@ public string ExpressionLambdaToSql(Expression exp, ExpTSC tsc)
                                                     whereGlobalFilter = tsc.whereGlobalFilter,
                                                     dbParams = tsc.dbParams
                                                 };
-                                                ExpressionLambdaToSql(b, thenTsc);
-                                                return thenTsc._returnISelect;
-                                            }).ToArray();
+                                                ExpressionLambdaToSql(arg3ExpNewArray.Expressions[arg3Idx], thenTsc);
+                                                arg3Values.SetValue(thenTsc._returnISelect, arg3Idx);
+                                            }
+                                            args[a] = arg3Values;
                                         }
                                         else if (typeof(ISelect0).IsAssignableFrom(arg3Exp.Type))
                                         {