Fixes #1103: Enable any/all in $compute #1115
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xuzhg
requested review from
KenitoInc,
habbes,
mikepizzo,
ElizabethOkerio and
gathogojr
habbes
reviewed
Nov 30, 2023
| @@ -373,7 +373,7 @@ public virtual Expression BindRangeVariable(RangeVariable rangeVariable, QueryBi | |||
| } | |||
|
|
|||
| // Be noted: it's used in $compute for $select and $expand. | |||
| if (context.Source != null) | |||
| if (context.Source != null && rangeVariable.Name == "$it") | |||
There was a problem hiding this comment.
Could you explain why this fixes the issue?
There was a problem hiding this comment.
in any/all lambda expression, it contains the RangeVariable also, it could be like "r", "x" (nested lambda).
However, for the whole $compute, it also contains the RangeVariable, it is "$it" (top-level).
When we Bind the top-level, we should use the "cached" source if apply,
When we Bind the nested lambda, we should use the lambda parameter.
So far, the "context.Source" solution looks "not a good" design, we'd like to continue to improve it when we refactor the applyBinder.
vabic
approved these changes
Nov 30, 2023
vabic
reviewed
Nov 30, 2023
Comment on lines
+291
to
+318
| [Fact] | ||
| public async Task QueryForAnResource_IncludesDollarComputeWithAnyClause_WithDollarSelect() | ||
| { | ||
| // Arrange | ||
| string queryUrl = "odata/Customers?$select=Id,HasSnickers&$compute=Candys/any(r:r eq 'Snickers') as HasSnickers"; | ||
| HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, queryUrl); | ||
| request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json;odata.metadata=none")); | ||
| HttpClient client = CreateClient(); | ||
| HttpResponseMessage response; | ||
|
|
||
| // Act | ||
| response = await client.SendAsync(request); | ||
|
|
||
| // Assert | ||
| string payload = await response.Content.ReadAsStringAsync(); | ||
|
|
||
| Assert.NotNull(response); | ||
| Assert.Equal(HttpStatusCode.OK, response.StatusCode); | ||
| Assert.NotNull(response.Content); | ||
|
|
||
| Assert.Equal("{\"value\":[" + | ||
| "{\"Id\":1,\"HasSnickers\":false}," + | ||
| "{\"Id\":2,\"HasSnickers\":false}," + | ||
| "{\"Id\":3,\"HasSnickers\":true}," + | ||
| "{\"Id\":4,\"HasSnickers\":true}," + | ||
| "{\"Id\":5,\"HasSnickers\":false}" + | ||
| "]}", payload); | ||
| } |
ElizabethOkerio
approved these changes
Dec 1, 2023
habbes
approved these changes
Dec 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1103: Compute with lambda expression
When we $select a computed property from a $compute containing a lambda expression, we should be careful to process the "source" for rangeVariable.
So, for example:
http://localhost:5102/odata/products?$select=HasSnikers&$compute=Candys/any(r:r eq 'Snikers') as HasSnikersThe compute.expression is an
AnyNodeand the body is the binary operator node. so, the rangeVariable ($it) of source forAnyNodeis the toplevel source, but the rangeVariable (r) is the lambda variable.