Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/dialect/clickhouse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ impl Dialect for ClickHouseDialect {
true
}

fn supports_in_unparenthesized_expr(&self) -> bool {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets add a link to the docs where the syntax comes from

true
}

/// See <https://clickhouse.com/docs/en/sql-reference/functions#higher-order-functions---operator-and-lambdaparams-expr-function>
fn supports_lambda_functions(&self) -> bool {
true
Expand Down
13 changes: 13 additions & 0 deletions src/dialect/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,15 @@ pub trait Dialect: Debug + Any {
false
}

/// Returns true if the dialect supports a bare expression as the right-hand
/// side of `IN`, without a parenthesized list — as in `x IN 'a'` or the
/// ClickHouse `{name:Type}` query-parameter placeholder `x IN {ids:Array(UInt64)}`.
/// The expression is wrapped into a single-element list, matching ClickHouse,
/// which reformats `x IN 'a'` to `x IN ('a')`.
Comment on lines +439 to +442

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// side of `IN`, without a parenthesized list — as in `x IN 'a'` or the
/// ClickHouse `{name:Type}` query-parameter placeholder `x IN {ids:Array(UInt64)}`.
/// The expression is wrapped into a single-element list, matching ClickHouse,
/// which reformats `x IN 'a'` to `x IN ('a')`.
/// side of `IN`, without a parenthesized list — as in `x IN 'a'`.

fn supports_in_unparenthesized_expr(&self) -> bool {
false
}

/// Returns true if the dialect supports `BEGIN {DEFERRED | IMMEDIATE | EXCLUSIVE | TRY | CATCH} [TRANSACTION]` statements
fn supports_start_transaction_modifier(&self) -> bool {
false
Expand Down Expand Up @@ -2051,6 +2060,10 @@ mod tests {
self.0.supports_in_empty_list()
}

fn supports_in_unparenthesized_expr(&self) -> bool {
self.0.supports_in_unparenthesized_expr()
}

fn convert_type_before_value(&self) -> bool {
self.0.convert_type_before_value()
}
Expand Down
11 changes: 11 additions & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4392,6 +4392,17 @@ impl<'a> Parser<'a> {
negated,
});
}
// ClickHouse accepts a bare expression as the IN RHS (e.g. `x IN 'a'` or
// a `{name:Type}` placeholder), wrapping it into a single-element list.
Comment on lines +4395 to +4396

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// ClickHouse accepts a bare expression as the IN RHS (e.g. `x IN 'a'` or
// a `{name:Type}` placeholder), wrapping it into a single-element list.

if self.dialect.supports_in_unparenthesized_expr()
&& self.peek_token_ref().token != Token::LParen
{
return Ok(Expr::InList {
expr: Box::new(expr),
list: vec![self.parse_expr()?],
negated,
});
}
self.expect_token(&Token::LParen)?;
let in_op = match self.maybe_parse(|p| p.parse_query())? {
Some(subquery) => Expr::InSubquery {
Expand Down
38 changes: 38 additions & 0 deletions tests/sqlparser_clickhouse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,44 @@ fn parse_inner_array_join() {
}
}

#[test]
fn parse_in_unparenthesized_placeholder() {
// ClickHouse `{name:Type}` query-parameter placeholder as the IN RHS, without parens.
match clickhouse().expr_parses_to("x IN {ids:Array(UInt64)}", "x IN ({ids: Array(UInt64)})") {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets rewrite these tests to use all_dialects_where and verified_stmt, we can remove the test for dialects that donts support the feature

Expr::InList { list, negated, .. } => {
assert!(!negated);
assert_eq!(list.len(), 1);
assert!(matches!(list[0], Expr::Dictionary(_)));
}
other => panic!("expected InList, got {other:?}"),
Comment on lines +1853 to +1858

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can probably drop the ast assertions, I think the funcationality is simple enough to rely only on roundtrip tests

}

// NOT IN sets negated.
match clickhouse().expr_parses_to(
"x NOT IN {ids:Array(UInt64)}",
"x NOT IN ({ids: Array(UInt64)})",
) {
Expr::InList { negated, .. } => assert!(negated),
other => panic!("expected InList, got {other:?}"),
}

// A bare scalar is also wrapped, matching ClickHouse (`x IN 'a'` -> `x IN ('a')`).
clickhouse().expr_parses_to("x IN 'a'", "x IN ('a')");

// The new branch must not fire when the next token is `(` (regressions).
clickhouse().verified_expr("x IN ({ids: Array(UInt64)})");
clickhouse().verified_expr("x IN (1, 2, 3)");
clickhouse().verified_stmt("SELECT * FROM t WHERE x IN (SELECT y FROM u)");

// Precedence: the trailing `AND` is not swallowed into the placeholder.
clickhouse().verified_expr("x IN ({p: Array(UInt64)}) AND y = 1");

// Dialect-scoped: GenericDialect (capability defaults false) still errors.
assert!(TestedDialects::new(vec![Box::new(GenericDialect {})])
.parse_sql_statements("SELECT * FROM t WHERE x IN {ids:Array(UInt64)}")
.is_err());
}

fn clickhouse() -> TestedDialects {
TestedDialects::new(vec![Box::new(ClickHouseDialect {})])
}
Expand Down
11 changes: 8 additions & 3 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2375,9 +2375,11 @@ fn parse_in_unnest() {

#[test]
fn parse_in_error() {
// <expr> IN <expr> is no valid
// <expr> IN <expr> is no valid, except in dialects that accept an
// unparenthesized expression as the IN right-hand side (e.g. ClickHouse).
let sql = "SELECT * FROM customers WHERE segment in segment";
let res = parse_sql_statements(sql);
let res =
all_dialects_except(|d| d.supports_in_unparenthesized_expr()).parse_sql_statements(sql);
assert_eq!(
ParserError::ParserError("Expected: (, found: segment".to_string()),
res.unwrap_err()
Expand Down Expand Up @@ -10834,8 +10836,11 @@ fn parse_position() {

#[test]
fn parse_position_negative() {
// Dialects that accept an unparenthesized IN right-hand side (e.g. ClickHouse)
// report a different error here, so exclude them.
let sql = "SELECT POSITION(foo IN) from bar";
let res = parse_sql_statements(sql);
let res =
all_dialects_except(|d| d.supports_in_unparenthesized_expr()).parse_sql_statements(sql);
assert_eq!(
ParserError::ParserError("Expected: (, found: )".to_string()),
res.unwrap_err()
Expand Down