Skip to content

Commit 555c1fa

Browse files
committed
CSHARP-5258: Fix as variable name in two code paths.
1 parent b802157 commit 555c1fa

File tree

4 files changed

+88
-4
lines changed

4 files changed

+88
-4
lines changed

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ExpressionToAggregationExpressionTranslator.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using MongoDB.Bson.Serialization;
2020
using MongoDB.Bson.Serialization.Serializers;
2121
using MongoDB.Driver.Linq.Linq3Implementation.Ast.Expressions;
22+
using MongoDB.Driver.Linq.Linq3Implementation.Misc;
2223
using MongoDB.Driver.Linq.Linq3Implementation.Serializers;
2324

2425
namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators
@@ -123,6 +124,15 @@ public static AggregationExpression TranslateLambdaBody(
123124
asRoot ?
124125
context.CreateSymbolWithVarName(parameterExpression, varName: "ROOT", parameterSerializer, isCurrent: true) :
125126
context.CreateSymbol(parameterExpression, parameterSerializer, isCurrent: false);
127+
128+
return TranslateLambdaBody(context, lambdaExpression, parameterSymbol);
129+
}
130+
131+
public static AggregationExpression TranslateLambdaBody(
132+
TranslationContext context,
133+
LambdaExpression lambdaExpression,
134+
Symbol parameterSymbol)
135+
{
126136
var lambdaContext = context.WithSymbol(parameterSymbol);
127137
var translatedBody = Translate(lambdaContext, lambdaExpression.Body);
128138

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/FirstOrLastMethodToAggregationExpressionTranslator.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16+
using System.Linq;
1617
using System.Linq.Expressions;
1718
using System.Reflection;
1819
using MongoDB.Driver.Linq.Linq3Implementation.Ast.Expressions;
@@ -97,12 +98,13 @@ public static AggregationExpression Translate(TranslationContext context, Method
9798
if (method.IsOneOf(__withPredicateMethods))
9899
{
99100
var predicateLambda = ExpressionHelper.UnquoteLambdaIfQueryableMethod(method, arguments[1]);
100-
var predicateTranslation = ExpressionToAggregationExpressionTranslator.TranslateLambdaBody(context, predicateLambda, itemSerializer, asRoot: false);
101-
var predicateParameter = predicateLambda.Parameters[0];
101+
var parameterExpression = predicateLambda.Parameters.Single();
102+
var parameterSymbol = context.CreateSymbol(parameterExpression, itemSerializer, isCurrent: false);
103+
var predicateTranslation = ExpressionToAggregationExpressionTranslator.TranslateLambdaBody(context, predicateLambda, parameterSymbol);
102104
sourceAst = AstExpression.Filter(
103105
input: sourceAst,
104106
cond: predicateTranslation.Ast,
105-
@as: predicateParameter.Name);
107+
@as: parameterSymbol.Var.Name);
106108
}
107109

108110
AstExpression ast;

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WhereMethodToAggregationExpressionTranslator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static AggregationExpression Translate(TranslationContext context, Method
5959
var ast = AstExpression.Filter(
6060
sourceTranslation.Ast,
6161
predicateTranslation.Ast,
62-
predicateParameter.Name,
62+
@as: predicateSymbol.Var.Name,
6363
limitTranslation?.Ast);
6464

6565
var resultSerializer = NestedAsQueryableSerializer.CreateIEnumerableOrNestedAsQueryableSerializer(expression.Type, itemSerializer);
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/* Copyright 2010-present MongoDB Inc.
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
using System.Linq;
17+
using FluentAssertions;
18+
using Xunit;
19+
20+
namespace MongoDB.Driver.Tests.Linq.Linq3Implementation.Jira
21+
{
22+
public class CSharp5258Tests : Linq3IntegrationTest
23+
{
24+
[Fact]
25+
public void Select_First_with_predicate_should_work()
26+
{
27+
var collection = GetCollection();
28+
29+
var queryable = collection.AsQueryable()
30+
.Select(_x => _x.List.First(_y => _y > 2));
31+
32+
var stages = Translate(collection, queryable);
33+
AssertStages(stages, "{ $project : { _v : { $arrayElemAt : [{ $filter : { input : '$List', as : 'v__0', cond : { $gt : ['$$v__0', 2] } } }, 0] }, _id : 0 } }");
34+
35+
var results = queryable.ToList();
36+
results.Should().Equal(3, 4);
37+
}
38+
39+
[Fact]
40+
public void Select_Where_should_work()
41+
{
42+
var collection = GetCollection();
43+
44+
var queryable = collection.AsQueryable()
45+
.Select(_x => _x.List.Where(_y => _y % 2 == 0));
46+
47+
var stages = Translate(collection, queryable);
48+
AssertStages(stages, "{ $project : { _v : { $filter : { input : '$List', as : 'v__0', cond : { $eq : [{ $mod : ['$$v__0', 2] }, 0] } } }, _id : 0 } }");
49+
50+
var results = queryable.ToList();
51+
results.Count.Should().Be(2);
52+
results[0].Should().Equal();
53+
results[1].Should().Equal(2, 4, 6);
54+
}
55+
56+
private IMongoCollection<C> GetCollection()
57+
{
58+
var collection = GetCollection<C>("test");
59+
CreateCollection(
60+
collection,
61+
new C { Id = 1, List = [1, 3, 5] },
62+
new C { Id = 2, List = [2, 4, 6] });
63+
return collection;
64+
}
65+
66+
private class C
67+
{
68+
public int Id { get; set; }
69+
public int[] List { get; set; }
70+
}
71+
}
72+
}

0 commit comments

Comments
 (0)