Fixes #3174: Enable $select=colProperty/$count query option parser #3175
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
mikepizzo
reviewed
Feb 26, 2025
| @@ -319,6 +323,15 @@ private SelectItem GenerateSelectItem(SelectTermToken tokenIn) | |||
| parsedPath.AddRange(selectedPath); | |||
| SelectExpandClause selectExpand = BindSelectExpand(null, tokenIn.SelectOption, parsedPath, this.ResourcePathNavigationSource, targetNavigationSource, elementTypeReference, generatedProperties); | |||
|
|
|||
| if (isCount) | |||
| { | |||
| // Do we need to throw exception if orderBy and nested select expand are not null within /$count ? | |||
There was a problem hiding this comment.
Yes; here, or somewhere, we should return an error if there is anything other than $filter/$search nested in a /$count(...). See https://github.com/oasis-tcs/odata-abnf/blob/e0b11964a13bf6ebe614b67933da8af0c155de4a/abnf/odata-abnf-construction-rules.txt#L313C2-L313C5
mikepizzo
reviewed
Feb 26, 2025
| @@ -964,15 +979,39 @@ private static void VerifySelectedPath(SelectTermToken selectedToken) | |||
| throw new ODataException(Error.Format(SRResources.SelectExpandBinder_SystemTokenInSelect, current.Identifier)); | |||
| } | |||
|
|
|||
| // Be design, the "/$count" should be built using SystemToken, but now, ODL is using NonSystemToken. | |||
| // Shall we support "no-dollar sign"? | |||
There was a problem hiding this comment.
/$count requires the '$', but ($count=true) does not.
mikepizzo
reviewed
Feb 26, 2025
| @@ -170,6 +165,8 @@ private PathSegmentToken ParseSegment(PathSegmentToken previousSegment, bool all | |||
| this.lexer.NextToken(); | |||
| } | |||
|
|
|||
| // By design, "/$count" or "/$ref" should return using SystemToken, but the existing implementation is using "NonSystemToken". | |||
| // So far, let's keep it unchanged. | |||
| Assert.Null(selectCountItem.Search); | ||
| } | ||
|
|
||
| // $select=colProperty/$count($search=...) |
There was a problem hiding this comment.
Can we have a test with nested expand, count and search.
For example:
- $expand=colProperty($count($search=...))
|
|
||
| Assert.Null(selectCountItem.Filter); | ||
| Assert.NotNull(selectCountItem.Search); | ||
| } |
There was a problem hiding this comment.
Do you want to add tests for scenarios where there is anything other than $filter/$search nested in a /$count(...)
- $select=colProperty/$count($orderby=...)
- $select=colProperty/$count($select=...)
- ...
WanjohiSammy
approved these changes
Feb 27, 2025
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 #3174: Enable $select=colProperty/$count query option parser
See details in #3174
See related OASIS tc issues at: Should ABNF support /$count in $Select · Issue #2046 · oasis-tcs/odata-specs