|
1 | 1 | using System;
|
| 2 | +using System.Collections; |
| 3 | +using System.Collections.Generic; |
2 | 4 | using System.Linq.Expressions;
|
3 | 5 | using NHibernate.Hql.Ast;
|
4 | 6 | using NHibernate.Linq.Clauses;
|
@@ -32,7 +34,7 @@ public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel quer
|
32 | 34 | NonAggregatingGroupByRewriter.ReWrite(queryModel);
|
33 | 35 |
|
34 | 36 | // Rewrite aggregate group-by statements
|
35 |
| - AggregatingGroupByRewriter.ReWrite(queryModel); |
| 37 | + AggregatingGroupByRewriter.ReWrite(queryModel, parameters.GroupByKeys); |
36 | 38 |
|
37 | 39 | // Rewrite aggregating group-joins
|
38 | 40 | AggregatingGroupJoinRewriter.ReWrite(queryModel);
|
@@ -74,7 +76,10 @@ public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel quer
|
74 | 76 | // Identify and name query sources
|
75 | 77 | QuerySourceIdentifier.Visit(parameters.QuerySourceNamer, queryModel);
|
76 | 78 |
|
77 |
| - var visitor = new QueryModelVisitor(parameters, root, queryModel) { RewrittenOperatorResult = result }; |
| 79 | + var visitor = new QueryModelVisitor(parameters, root, queryModel) |
| 80 | + { |
| 81 | + RewrittenOperatorResult = result, |
| 82 | + }; |
78 | 83 | visitor.Visit();
|
79 | 84 |
|
80 | 85 | return visitor._hqlTree.GetTranslation();
|
@@ -230,7 +235,7 @@ public override void VisitSelectClause(SelectClause selectClause, QueryModel que
|
230 | 235 | {
|
231 | 236 | CurrentEvaluationType = selectClause.GetOutputDataInfo();
|
232 | 237 |
|
233 |
| - var visitor = new SelectClauseVisitor(typeof(object[]), VisitorParameters); |
| 238 | + var visitor = new SelectClauseVisitor(typeof(object[]), VisitorParameters, VisitorParameters.GroupByKeys); |
234 | 239 |
|
235 | 240 | visitor.Visit(selectClause.Selector);
|
236 | 241 |
|
|
0 commit comments