Skip to content

Commit 848dc65

Browse files
committed
fix!: remove parensless lambda from generic
1 parent 94e71ff commit 848dc65

7 files changed

Lines changed: 59 additions & 8 deletions

File tree

‎src/dialect/clickhouse.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,8 @@ impl Dialect for ClickHouseDialect {
7575
fn supports_lambda_functions(&self) -> bool {
7676
true
7777
}
78+
79+
fn supports_parensless_lambda_functions(&self) -> bool {
80+
true
81+
}
7882
}

‎src/dialect/databricks.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ impl Dialect for DatabricksDialect {
5151
true
5252
}
5353

54+
fn supports_parensless_lambda_functions(&self) -> bool {
55+
true
56+
}
57+
5458
// https://docs.databricks.com/en/sql/language-manual/sql-ref-syntax-qry-select.html#syntax
5559
fn supports_select_wildcard_except(&self) -> bool {
5660
true

‎src/dialect/duckdb.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ impl Dialect for DuckDbDialect {
7070
true
7171
}
7272

73+
fn supports_parensless_lambda_functions(&self) -> bool {
74+
true
75+
}
76+
7377
// DuckDB is compatible with PostgreSQL syntax for this statement,
7478
// although not all features may be implemented.
7579
fn supports_explain_with_utility_options(&self) -> bool {

‎src/dialect/mod.rs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,21 @@ pub trait Dialect: Debug + Any {
340340
/// Returns true if the dialect supports lambda functions, for example:
341341
///
342342
/// ```sql
343-
/// SELECT transform(array(1, 2, 3), x -> x + 1); -- returns [2,3,4]
343+
/// SELECT transform(array(1, 2, 3), (x) -> x + 1); -- returns [2,3,4]
344344
/// ```
345345
fn supports_lambda_functions(&self) -> bool {
346346
false
347347
}
348348

349+
/// Returns true if the dialect supports lambda functions without parentheses for a single argument, for example:
350+
///
351+
/// ```sql
352+
/// SELECT transform(array(1, 2, 3), x -> x + 1); -- returns [2,3,4]
353+
/// ```
354+
fn supports_parensless_lambda_functions(&self) -> bool {
355+
false
356+
}
357+
349358
/// Returns true if the dialect supports method calls, for example:
350359
///
351360
/// ```sql

‎src/parser/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ impl<'a> Parser<'a> {
12681268
value: self.parse_introduced_string_value()?,
12691269
})
12701270
}
1271-
Token::Arrow if self.dialect.supports_lambda_functions() => {
1271+
Token::Arrow if self.dialect.supports_parensless_lambda_functions() => {
12721272
self.expect_token(&Token::Arrow)?;
12731273
Ok(Expr::Lambda(LambdaFunction {
12741274
params: OneOrManyWithParens::One(w.clone().into_ident(w_span)),

‎tests/sqlparser_common.rs‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13348,5 +13348,35 @@ fn test_lambdas() {
1334813348
dialects.verified_expr(
1334913349
"map_zip_with(map(1, 'a', 2, 'b'), map(1, 'x', 2, 'y'), (k, v1, v2) -> concat(v1, v2))",
1335013350
);
13351-
dialects.verified_expr("transform(array(1, 2, 3), x -> x + 1)");
13351+
dialects.verified_expr("transform(array(1, 2, 3), (x) -> x + 1)");
13352+
}
13353+
13354+
#[test]
13355+
fn test_parensless_lambdas() {
13356+
let dialects = all_dialects_where(|d| d.supports_parensless_lambda_functions());
13357+
13358+
pretty_assertions::assert_eq!(
13359+
call(
13360+
"transform",
13361+
[
13362+
call(
13363+
"array",
13364+
[
13365+
Expr::Value(Value::Number("1".to_owned(), false)),
13366+
Expr::Value(Value::Number("2".to_owned(), false)),
13367+
Expr::Value(Value::Number("3".to_owned(), false)),
13368+
]
13369+
),
13370+
Expr::Lambda(LambdaFunction {
13371+
params: OneOrManyWithParens::One(Ident::new("x")),
13372+
body: Box::new(Expr::BinaryOp {
13373+
left: Box::new(Expr::Identifier(Ident::new("x"))),
13374+
op: BinaryOperator::Plus,
13375+
right: Box::new(Expr::Value(Value::Number("1".to_owned(), false)))
13376+
})
13377+
})
13378+
]
13379+
),
13380+
dialects.verified_expr("transform(array(1, 2, 3), x -> x + 1)")
13381+
);
1335213382
}

‎tests/sqlparser_postgres.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,7 +2749,7 @@ fn test_json() {
27492749
);
27502750

27512751
let sql = "SELECT params -> 'name' FROM events";
2752-
let select = pg().verified_only_select(sql);
2752+
let select = pg_and_generic().verified_only_select(sql);
27532753
assert_eq!(
27542754
SelectItem::UnnamedExpr(Expr::BinaryOp {
27552755
left: Box::new(Expr::Identifier(Ident::new("params"))),
@@ -2760,7 +2760,7 @@ fn test_json() {
27602760
);
27612761

27622762
let sql = "SELECT info -> 'items' ->> 'product' FROM orders";
2763-
let select = pg().verified_only_select(sql);
2763+
let select = pg_and_generic().verified_only_select(sql);
27642764
assert_eq!(
27652765
SelectItem::UnnamedExpr(Expr::BinaryOp {
27662766
left: Box::new(Expr::BinaryOp {
@@ -2778,7 +2778,7 @@ fn test_json() {
27782778

27792779
// the RHS can be a number (array element access)
27802780
let sql = "SELECT obj -> 42";
2781-
let select = pg().verified_only_select(sql);
2781+
let select = pg_and_generic().verified_only_select(sql);
27822782
assert_eq!(
27832783
SelectItem::UnnamedExpr(Expr::BinaryOp {
27842784
left: Box::new(Expr::Identifier(Ident::new("obj"))),
@@ -2790,7 +2790,7 @@ fn test_json() {
27902790

27912791
// the RHS can be an identifier
27922792
let sql = "SELECT obj -> key";
2793-
let select = pg().verified_only_select(sql);
2793+
let select = pg_and_generic().verified_only_select(sql);
27942794
assert_eq!(
27952795
SelectItem::UnnamedExpr(Expr::BinaryOp {
27962796
left: Box::new(Expr::Identifier(Ident::new("obj"))),
@@ -2802,7 +2802,7 @@ fn test_json() {
28022802

28032803
// -> operator has lower precedence than arithmetic ops
28042804
let sql = "SELECT obj -> 3 * 2";
2805-
let select = pg().verified_only_select(sql);
2805+
let select = pg_and_generic().verified_only_select(sql);
28062806
assert_eq!(
28072807
SelectItem::UnnamedExpr(Expr::BinaryOp {
28082808
left: Box::new(Expr::Identifier(Ident::new("obj"))),

0 commit comments

Comments
 (0)