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

Fix parsing of COLLATE after parentheses in expressions (#507)

Browse source
This commit is contained in:
Riccardo Azzolini 2022-05-25 22:10:38 +02:00 • committed by GitHub
parent 901f5b974f
commit 0fa812bd2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/parser.rs
View file

@ -525,17 +525,18 @@ impl<'a> Parser<'a> {
};
self.expect_token(&Token::RParen)?;
if !self.consume_token(&Token::Period) {
return Ok(expr);
Ok(expr)
} else {
let tok = self.next_token();
let key = match tok {
Token::Word(word) => word.to_ident(),
_ => return parser_err!(format!("Expected identifier, found: {}", tok)),
};
Ok(Expr::CompositeAccess {
expr: Box::new(expr),
key,
})
}
let tok = self.next_token();
let key = match tok {
Token::Word(word) => word.to_ident(),
_ => return parser_err!(format!("Expected identifier, found: {}", tok)),
};
Ok(Expr::CompositeAccess {
expr: Box::new(expr),
key,
})
}
Token::Placeholder(_) => {
self.prev_token();

9
tests/sqlparser_common.rs
View file

@ -561,6 +561,15 @@ fn parse_collate() {
);
}
#[test]
fn parse_collate_after_parens() {
let sql = "SELECT (name) COLLATE \"de_DE\" FROM customer";
assert_matches!(
only(&all_dialects().verified_only_select(sql).projection),
SelectItem::UnnamedExpr(Expr::Collate { .. })
);
}
#[test]
fn parse_select_string_predicate() {
let sql = "SELECT id, fname, lname FROM customer \