goldmedal commented on code in PR #1551:
URL:
https://github.com/apache/datafusion-sqlparser-rs/pull/1551#discussion_r1876216235
##########
src/parser/mod.rs:
##########
@@ -1144,53 +1144,52 @@ impl<'a> Parser<'a> {
w_span: Span,
) -> Result<Expr, ParserError> {
match self.peek_token().token {
- Token::LParen | Token::Period => {
- let mut id_parts: Vec<Ident> = vec![w.to_ident(w_span)];
- let mut ending_wildcard: Option<TokenWithSpan> = None;
- while self.consume_token(&Token::Period) {
- let next_token = self.next_token();
- match next_token.token {
- Token::Word(w) =>
id_parts.push(w.to_ident(next_token.span)),
- Token::Mul => {
- // Postgres explicitly allows funcnm(tablenm.*)
and the
- // function array_agg traverses this control flow
- if dialect_of!(self is PostgreSqlDialect) {
- ending_wildcard = Some(next_token);
- break;
- } else {
- return self.expected("an identifier after
'.'", next_token);
- }
- }
- Token::SingleQuotedString(s) =>
id_parts.push(Ident::with_quote('\'', s)),
- _ => {
- return self.expected("an identifier or a '*' after
'.'", next_token);
- }
+ Token::Period =>
self.parse_compound_expr(Expr::Identifier(w.to_ident(w_span)), vec![]),
+ Token::LParen => {
+ let id_parts = vec![w.to_ident(w_span)];
+ // parse_comma_outer_join is used to parse the following
pattern:
+ if dialect_of!(self is SnowflakeDialect | MsSqlDialect)
+ && self.consume_tokens(&[Token::LParen, Token::Plus,
Token::RParen])
+ {
+ Ok(Expr::OuterJoin(Box::new(
+ match <[Ident; 1]>::try_from(id_parts) {
+ Ok([ident]) => Expr::Identifier(ident),
+ Err(parts) => Expr::CompoundIdentifier(parts),
+ },
+ )))
+ } else {
+ let mut expr = self.parse_function(ObjectName(id_parts))?;
+ // consume all period if it's a method chain
+ if self.dialect.supports_methods() {
+ expr = self.try_parse_method(expr)?
}
- }
-
- if let Some(wildcard_token) = ending_wildcard {
- Ok(Expr::QualifiedWildcard(
- ObjectName(id_parts),
- AttachedToken(wildcard_token),
- ))
- } else if self.consume_token(&Token::LParen) {
- if dialect_of!(self is SnowflakeDialect | MsSqlDialect)
- && self.consume_tokens(&[Token::Plus, Token::RParen])
- {
- Ok(Expr::OuterJoin(Box::new(
- match <[Ident; 1]>::try_from(id_parts) {
- Ok([ident]) => Expr::Identifier(ident),
- Err(parts) => Expr::CompoundIdentifier(parts),
- },
- )))
- } else {
- self.prev_token();
- self.parse_function(ObjectName(id_parts))
+ let mut fields = vec![];
+ // if the function returns an array, it can be subscripted
+ if self.consume_token(&Token::LBracket) {
+ self.parse_multi_dim_subscript(&mut fields)?;
Review Comment:
You're right. We can remove this parsing.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
