fix(jdbc-v2): Correctly parse mixed-order CTEs in SqlParser #2611
Conversation
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
![windsurf-bot[bot]](https://avatars.githubusercontent.com/in/1066231?s=60&v=4){kind=small}
jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4
Outdated
Show resolved
Hide resolved
The grammar for CTEs was too restrictive. It required a specific order for different CTE syntax styles. The grammar expected all CTEs to be defined before all CSEs (Common Scalar Expression). This commit refactors the `ctes` grammar rule to be more flexible. It introduces a new, more generic `cte` rule that can represent either CTE style. The main `ctes` rule is now defined as a list of these generic `cte` elements, allowing them to appear in any order.
AVMusorin
force-pushed
the
fix-variables-replacing
branch
from
d312221 to
accec17
Compare
Contributor
|
Good day, @AVMusorin ! Actually CTEs were defined incorrectly in the grammar - they were included twice. |
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.
Summary
The grammar for CTEs was too restrictive. It required a specific order for different CTE syntax styles.
The grammar expected all CTEs to be defined before all CSEs (Common Scalar Expression).
This commit refactors the
ctesgrammar rule to be more flexible. It introduces a new, more genericcterule that can represent either CTE style. The mainctesrule is now defined as a list of these genericcteelements, allowing them to appear in any order.Checklist
Delete items not relevant to your PR: