Fix COLLATE parsing after compound identifiers#2294
Merged
yoavcloud merged 3 commits intoapache:mainfrom Apr 13, 2026
Merged
Conversation
Move the COLLATE parsing from the end of `parse_prefix` to `parse_subexpr` after `parse_compound_expr`, so that `expr COLLATE collation` is handled correctly when `expr` is a compound identifier (e.g. `t1.col COLLATE Latin1_General_CI_AS`).
yoavcloud
reviewed
Apr 9, 2026
|
|
||
| expr = self.parse_compound_expr(expr, vec![])?; | ||
|
|
||
| if !self.in_column_definition_state() && self.parse_keyword(Keyword::COLLATE) { |
Contributor
There was a problem hiding this comment.
Suggest adding documentation here for future developers to explain why this code is here
yoavcloud
requested changes
Apr 9, 2026
yoavcloud
approved these changes
Apr 13, 2026
Contributor
|
Looks good @romanb! Please address the conflicts and we should be good to go. |
auto-merge was automatically disabled
April 13, 2026 12:21
Head branch was pushed to by a user without write access
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Currently the following valid SQL fails to parse with the MSSQL dialect:
This PR moves the
COLLATEparsing within expressions from the end ofparse_prefixtoparse_subexprafterparse_compound_expr, so thatexpr COLLATE collationis also handled correctly whenexpris a compound identifier.