feat(clickhouse): support PARTITION BY after ORDER BY and ARRAY JOIN#2283
Open
cristhiank wants to merge 5 commits intoapache:mainfrom
Open
feat(clickhouse): support PARTITION BY after ORDER BY and ARRAY JOIN#2283cristhiank wants to merge 5 commits intoapache:mainfrom
cristhiank wants to merge 5 commits intoapache:mainfrom
Conversation
ClickHouse DDL allows PARTITION BY to appear after ORDER BY, which differs from standard SQL ordering. This change makes the parser accept both orderings when using the ClickHouseDialect or GenericDialect. Fixes a parse failure for production ClickHouse CREATE TABLE statements like: CREATE TABLE t (...) ENGINE = MergeTree() ORDER BY (...) PARTITION BY expr Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
ClickHouse supports ARRAY JOIN clauses for unnesting arrays inline. This adds JoinOperator variants for ARRAY JOIN, LEFT ARRAY JOIN, and INNER ARRAY JOIN. These joins take a table expression (the array to unnest) rather than a standard table reference, and do not use ON/USING constraints. Also adds Spanned impls for the new variants in spans.rs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
cristhiank
force-pushed
the
fix/clickhouse-partition-and-array-join
branch
from
d27aeca to
097a929
Compare
yoavcloud
reviewed
Apr 9, 2026
| // ClickHouse allows PARTITION BY after ORDER BY | ||
| // https://clickhouse.com/docs/en/sql-reference/statements/create/table#partition-by | ||
| let partition_by = if create_table_config.partition_by.is_none() | ||
| && dialect_of!(self is ClickHouseDialect | GenericDialect) |
Contributor
There was a problem hiding this comment.
Can this condition be converted to a dialect function?
Author
There was a problem hiding this comment.
Thanks for the review, addressed in the latest changes.
yoavcloud
reviewed
Apr 9, 2026
| constraint: self.parse_join_constraint(false)?, | ||
| }, | ||
| } | ||
| } else if dialect_of!(self is ClickHouseDialect | GenericDialect) |
Contributor
There was a problem hiding this comment.
Can this condition be converted to a dialect function?
Author
There was a problem hiding this comment.
Thanks for the review, addressed in the latest changes.
yoavcloud
reviewed
Apr 9, 2026
| global, | ||
| join_operator: JoinOperator::InnerArrayJoin, | ||
| } | ||
| } else if dialect_of!(self is ClickHouseDialect | GenericDialect) |
Contributor
There was a problem hiding this comment.
Can this condition be converted to a dialect function?
Author
There was a problem hiding this comment.
Thanks for the review, addressed in the latest changes.
yoavcloud
reviewed
Apr 9, 2026
| global, | ||
| join_operator: JoinOperator::LeftArrayJoin, | ||
| } | ||
| } else if dialect_of!(self is ClickHouseDialect | GenericDialect) |
Contributor
There was a problem hiding this comment.
Can this condition be converted to a dialect function?
Author
There was a problem hiding this comment.
Thanks for the review, addressed in the latest changes.
yoavcloud
requested changes
Apr 9, 2026
…ition-and-array-join
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
yoavcloud
approved these changes
Apr 16, 2026
clippy 1.95 stable newly flags 8 pre-existing patterns in parser/mod.rs where an `if` inside a match arm body can be expressed as a match guard. Applies clippy's suggested fix verbatim. No behavior change.
Author
|
Fixed a Rust/lint failure introduced by clippy 1.95 — 8 pre-existing collapsible_match patterns in parser/mod.rs, converted to match guards per clippy's suggestions. No behavior change. |
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.
Summary
Two ClickHouse dialect improvements:
PARTITION BY after ORDER BY — ClickHouse CREATE TABLE DDL places PARTITION BY after ORDER BY, which differs from standard SQL. The parser now accepts both orderings when using the ClickHouseDialect or GenericDialect.
ARRAY JOIN support — Adds \JoinOperator\ variants for \ARRAY JOIN, \LEFT ARRAY JOIN, and \INNER ARRAY JOIN. These are ClickHouse-specific constructs for unnesting arrays inline.
Motivation
These patterns appear in production ClickHouse deployments and currently fail to parse with the ClickHouseDialect.
Changes