Skip to content

Commit 4ee991f

Browse files
committed
NH-3797 - Fixed tabification
1 parent 148412c commit 4ee991f

File tree

6 files changed

+43
-43
lines changed

6 files changed

+43
-43
lines changed

src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -520,26 +520,26 @@ into grp
520520
Assert.That(result.Count, Is.EqualTo(77));
521521
}
522522

523-
[Test(Description = "NH-3797")]
524-
public void GroupByComputedValue()
525-
{
526-
var orderGroups = db.Orders.GroupBy(o => o.Customer.CustomerId == null ? 0 : 1).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
527-
Assert.AreEqual(830, orderGroups.Sum(g => g.Count));
528-
}
529-
530-
[Test(Description = "NH-3797")]
531-
public void GroupByComputedValueInAnonymousType()
532-
{
533-
var orderGroups = db.Orders.GroupBy(o => new { Key = o.Customer.CustomerId == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
534-
Assert.AreEqual(830, orderGroups.Sum(g => g.Count));
535-
}
536-
537-
[Test(Description = "NH-3797")]
538-
public void GroupByComputedValueInObjectArray()
539-
{
540-
var orderGroups = db.Orders.GroupBy(o => new[] { o.Customer.CustomerId == null ? 0 : 1, }).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
541-
Assert.AreEqual(830, orderGroups.Sum(g => g.Count));
542-
}
523+
[Test(Description = "NH-3797")]
524+
public void GroupByComputedValue()
525+
{
526+
var orderGroups = db.Orders.GroupBy(o => o.Customer.CustomerId == null ? 0 : 1).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
527+
Assert.AreEqual(830, orderGroups.Sum(g => g.Count));
528+
}
529+
530+
[Test(Description = "NH-3797")]
531+
public void GroupByComputedValueInAnonymousType()
532+
{
533+
var orderGroups = db.Orders.GroupBy(o => new { Key = o.Customer.CustomerId == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
534+
Assert.AreEqual(830, orderGroups.Sum(g => g.Count));
535+
}
536+
537+
[Test(Description = "NH-3797")]
538+
public void GroupByComputedValueInObjectArray()
539+
{
540+
var orderGroups = db.Orders.GroupBy(o => new[] { o.Customer.CustomerId == null ? 0 : 1, }).Select(g => new { Key = g.Key, Count = g.Count() }).ToList();
541+
Assert.AreEqual(830, orderGroups.Sum(g => g.Count));
542+
}
543543

544544
private static void CheckGrouping<TKey, TElement>(IEnumerable<IGrouping<TKey, TElement>> groupedItems, Func<TElement, TKey> groupBy)
545545
{

src/NHibernate/Linq/GroupBy/AggregatingGroupByRewriter.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public static class AggregatingGroupByRewriter
4444
typeof (CacheableResultOperator)
4545
};
4646

47-
public static void ReWrite(QueryModel queryModel, IList<Expression> groupByKeys)
47+
public static void ReWrite(QueryModel queryModel, IList<Expression> groupByKeys)
4848
{
49-
var subQueryExpression = queryModel.MainFromClause.FromExpression as SubQueryExpression;
49+
var subQueryExpression = queryModel.MainFromClause.FromExpression as SubQueryExpression;
5050

5151
if (subQueryExpression != null)
5252
{
@@ -59,8 +59,8 @@ public static void ReWrite(QueryModel queryModel, IList<Expression> groupByKeys)
5959
var groupBy = operators[0] as GroupResultOperator;
6060
if (groupBy != null)
6161
{
62-
groupBy.ExtractKeyExpressions(groupByKeys);
63-
FlattenSubQuery(queryModel, subQueryExpression.QueryModel, groupBy);
62+
groupBy.ExtractKeyExpressions(groupByKeys);
63+
FlattenSubQuery(queryModel, subQueryExpression.QueryModel, groupBy);
6464
}
6565
}
6666
}
@@ -94,7 +94,7 @@ private static void FlattenSubQuery(QueryModel queryModel, QueryModel subQueryMo
9494
queryModel.BodyClauses.Add(bodyClause);
9595

9696
// Replace the outer select clause...
97-
queryModel.SelectClause.TransformExpressions(s =>
97+
queryModel.SelectClause.TransformExpressions(s =>
9898
GroupBySelectClauseRewriter.ReWrite(s, groupBy, subQueryModel));
9999

100100
// Point all query source references to the outer from clause

src/NHibernate/Linq/GroupResultOperatorExtensions.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
namespace NHibernate.Linq
1010
{
11-
internal static class GroupResultOperatorExtensions
12-
{
13-
public static void ExtractKeyExpressions(this GroupResultOperator groupResult, IList<Expression> groupByKeys)
14-
{
15-
if (groupResult.KeySelector is NewExpression)
16-
(groupResult.KeySelector as NewExpression).Arguments.ForEach(groupByKeys.Add);
17-
else if (groupResult.KeySelector is NewArrayExpression)
18-
(groupResult.KeySelector as NewArrayExpression).Expressions.ForEach(groupByKeys.Add);
19-
else
20-
groupByKeys.Add(groupResult.KeySelector);
21-
}
22-
}
11+
internal static class GroupResultOperatorExtensions
12+
{
13+
public static void ExtractKeyExpressions(this GroupResultOperator groupResult, IList<Expression> groupByKeys)
14+
{
15+
if (groupResult.KeySelector is NewExpression)
16+
(groupResult.KeySelector as NewExpression).Arguments.ForEach(groupByKeys.Add);
17+
else if (groupResult.KeySelector is NewArrayExpression)
18+
(groupResult.KeySelector as NewArrayExpression).Expressions.ForEach(groupByKeys.Add);
19+
else
20+
groupByKeys.Add(groupResult.KeySelector);
21+
}
22+
}
2323
}

src/NHibernate/Linq/Visitors/QueryModelVisitor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel quer
3434
NonAggregatingGroupByRewriter.ReWrite(queryModel);
3535

3636
// Rewrite aggregate group-by statements
37-
AggregatingGroupByRewriter.ReWrite(queryModel, parameters.GroupByKeys);
37+
AggregatingGroupByRewriter.ReWrite(queryModel, parameters.GroupByKeys);
3838

3939
// Rewrite aggregating group-joins
4040
AggregatingGroupJoinRewriter.ReWrite(queryModel);
@@ -78,7 +78,7 @@ public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel quer
7878

7979
var visitor = new QueryModelVisitor(parameters, root, queryModel)
8080
{
81-
RewrittenOperatorResult = result,
81+
RewrittenOperatorResult = result,
8282
};
8383
visitor.Visit();
8484

@@ -99,7 +99,7 @@ public static ExpressionToHqlTranslationResults GenerateHqlQuery(QueryModel quer
9999

100100
public ResultOperatorRewriterResult RewrittenOperatorResult { get; private set; }
101101

102-
static QueryModelVisitor()
102+
static QueryModelVisitor()
103103
{
104104
// TODO - reflection to build map
105105
ResultOperatorMap = new ResultOperatorMap();

src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public SelectClauseVisitor(System.Type inputType, VisitorParameters parameters,
2323
_inputParameter = Expression.Parameter(inputType, "input");
2424
_parameters = parameters;
2525
_hqlVisitor = new HqlGeneratorExpressionTreeVisitor(_parameters);
26-
_hqlNodes = new HashSet<Expression>(groupByKeys);
26+
_hqlNodes = new HashSet<Expression>(groupByKeys);
2727
}
2828

2929
public LambdaExpression ProjectionExpression { get; private set; }

src/NHibernate/Linq/Visitors/VisitorParameters.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class VisitorParameters
1616

1717
public QuerySourceNamer QuerySourceNamer { get; set; }
1818

19-
public IList<Expression> GroupByKeys { get; private set; }
19+
public IList<Expression> GroupByKeys { get; private set; }
2020

2121
public VisitorParameters(
2222
ISessionFactoryImplementor sessionFactory,
@@ -28,7 +28,7 @@ public VisitorParameters(
2828
ConstantToParameterMap = constantToParameterMap;
2929
RequiredHqlParameters = requiredHqlParameters;
3030
QuerySourceNamer = querySourceNamer;
31-
GroupByKeys = new List<Expression>();
31+
GroupByKeys = new List<Expression>();
3232
}
3333
}
3434
}

0 commit comments

Comments
 (0)