From 2a32b9f553f31cd7001c7ca6e1fc6f2f82ab60dd Mon Sep 17 00:00:00 2001 From: Jia-Xuan Liu Date: Thu, 5 Dec 2024 01:01:26 +0800 Subject: [PATCH] fmt --- src/parser/mod.rs | 17 ++++++------- tests/sqlparser_postgres.rs | 49 +++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/parser/mod.rs b/src/parser/mod.rs index b2610b732..6f0a1abd3 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -1172,7 +1172,8 @@ impl<'a> Parser<'a> { self.parse_compound_expr(expr, fields) } } - Token::LBracket if dialect_of!(self is PostgreSqlDialect | DuckDbDialect | GenericDialect | ClickHouseDialect | BigQueryDialect) => { + Token::LBracket if dialect_of!(self is PostgreSqlDialect | DuckDbDialect | GenericDialect | ClickHouseDialect | BigQueryDialect) => + { let _ = self.consume_token(&Token::LBracket); let ident = Expr::Identifier(w.to_ident(w_span)); let mut fields = vec![]; @@ -1440,12 +1441,12 @@ impl<'a> Parser<'a> { let expr = Expr::Identifier(w.to_ident(next_token.span)); chain.push(AccessField::Expr(expr)); if self.consume_token(&Token::LBracket) { - if self.dialect.supports_partiql() { - ending_lbracket = true; - break; - } else { - self.parse_multi_dim_subscript(&mut chain)? - } + if self.dialect.supports_partiql() { + ending_lbracket = true; + break; + } else { + self.parse_multi_dim_subscript(&mut chain)? + } } } Token::Mul => { @@ -1473,7 +1474,6 @@ impl<'a> Parser<'a> { self.prev_token(); } - if let Some(wildcard_token) = ending_wildcard { let Some(id_parts) = Self::exprs_to_idents(&root, &chain) else { return self.expected("an identifier or a '*' after '.'", self.peek_token()); @@ -3100,7 +3100,6 @@ impl<'a> Parser<'a> { let mut chain = vec![]; self.parse_multi_dim_subscript(&mut chain)?; self.parse_compound_expr(expr, chain) - } else if self.dialect.supports_partiql() { self.prev_token(); self.parse_json_access(expr) diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs index ee2006601..247fa9ab3 100644 --- a/tests/sqlparser_postgres.rs +++ b/tests/sqlparser_postgres.rs @@ -2114,8 +2114,9 @@ fn parse_array_index_expr() { index: num[0].clone() }), AccessField::SubScript(Subscript::Index { - index: num[0].clone() - })], + index: num[0].clone() + }) + ], }, expr_from_projection(only(&select.projection)), ); @@ -2153,23 +2154,23 @@ fn parse_array_index_expr() { assert_eq!( &Expr::CompoundExpr { root: Box::new(Expr::Nested(Box::new(Expr::Cast { - kind: CastKind::Cast, - expr: Box::new(Expr::Array(Array { - elem: vec![Expr::Array(Array { - elem: vec![num[2].clone(), num[3].clone(),], - named: true, - })], + kind: CastKind::Cast, + expr: Box::new(Expr::Array(Array { + elem: vec![Expr::Array(Array { + elem: vec![num[2].clone(), num[3].clone(),], named: true, - })), - data_type: DataType::Array(ArrayElemTypeDef::SquareBracket( - Box::new(DataType::Array(ArrayElemTypeDef::SquareBracket( - Box::new(DataType::Int(None)), - None - ))), + })], + named: true, + })), + data_type: DataType::Array(ArrayElemTypeDef::SquareBracket( + Box::new(DataType::Array(ArrayElemTypeDef::SquareBracket( + Box::new(DataType::Int(None)), None - )), - format: None, - }))), + ))), + None + )), + format: None, + }))), chain: vec![ AccessField::SubScript(Subscript::Index { index: num[1].clone() @@ -2284,13 +2285,13 @@ fn parse_array_multi_subscript() { assert_eq!( Expr::CompoundExpr { root: Box::new(call( - "make_array", - vec![ - Expr::Value(number("1")), - Expr::Value(number("2")), - Expr::Value(number("3")) - ] - )), + "make_array", + vec![ + Expr::Value(number("1")), + Expr::Value(number("2")), + Expr::Value(number("3")) + ] + )), chain: vec![ AccessField::SubScript(Subscript::Slice { lower_bound: Some(Expr::Value(number("1"))),