mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-08-20 06:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add Expr::tuple + parsing (#414)

Browse source
This commit is contained in:
Andrew Lamb 2022-02-08 10:54:27 -05:00 • committed by GitHub
parent 8a3544abae
commit ff558eeb61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/parser.rs
View file

@ -494,7 +494,12 @@ impl<'a> Parser<'a> {
self.prev_token();
Expr::Subquery(Box::new(self.parse_query()?))
} else {
Expr::Nested(Box::new(self.parse_expr()?))
let exprs = self.parse_comma_separated(Parser::parse_expr)?;
match exprs.len() {
0 => unreachable!(), // parse_comma_separated ensures 1 or more
1 => Expr::Nested(Box::new(exprs.into_iter().next().unwrap())),
_ => Expr::Tuple(exprs),
}
};
self.expect_token(&Token::RParen)?;
Ok(expr)
@ -2739,19 +2744,8 @@ impl<'a> Parser<'a> {
None
};
// Not Sure if Top should be cheked here as well. Trino doesn't support TOP.
let is_l_paren = if distinct {
self.consume_token(&Token::LParen)
} else {
false
};
let projection = self.parse_comma_separated(Parser::parse_select_item)?;
if is_l_paren && !self.consume_token(&Token::RParen) {
return self.expected(")", self.peek_token());
}
// Note that for keywords to be properly handled here, they need to be
// added to `RESERVED_FOR_COLUMN_ALIAS` / `RESERVED_FOR_TABLE_ALIAS`,
// otherwise they may be parsed as an alias as part of the `projection`