mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-09-04 05:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Support AS and qualified wildcards in SELECT

Browse source
This commit is contained in:
Nickolay Ponomarev 2019-02-03 06:40:17 +03:00
parent bf0c07bb1b
commit bed03abe44
5 changed files with 160 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/sqlparser.rs
View file

@ -178,9 +178,14 @@ impl Parser {
Some(Token::LParen) => self.parse_function(w.as_sql_ident()),
Some(Token::Period) => {
let mut id_parts: Vec<SQLIdent> = vec![w.as_sql_ident()];
let mut ends_with_wildcard = false;
while self.consume_token(&Token::Period) {
match self.next_token() {
Some(Token::SQLWord(w)) => id_parts.push(w.as_sql_ident()),
Some(Token::Mult) => {
ends_with_wildcard = true;
break;
}
_ => {
return parser_err!(format!(
"Error parsing compound identifier"
@ -188,7 +193,11 @@ impl Parser {
}
}
}
Ok(ASTNode::SQLCompoundIdentifier(id_parts))
if ends_with_wildcard {
Ok(ASTNode::SQLQualifiedWildcard(id_parts))
} else {
Ok(ASTNode::SQLCompoundIdentifier(id_parts))
}
}
_ => Ok(ASTNode::SQLIdentifier(w.as_sql_ident())),
},
@ -1193,7 +1202,7 @@ impl Parser {
/// Parse a restricted `SELECT` statement (no CTEs / `UNION` / `ORDER BY`),
/// assuming the initial `SELECT` was already consumed
pub fn parse_select(&mut self) -> Result<SQLSelect, ParserError> {
let projection = self.parse_expr_list()?;
let projection = self.parse_select_list()?;
let (relation, joins) = if self.parse_keyword("FROM") {
let relation = Some(self.parse_table_factor()?);
@ -1381,20 +1390,42 @@ impl Parser {
let mut expr_list: Vec<ASTNode> = vec![];
loop {
expr_list.push(self.parse_expr()?);
if let Some(t) = self.peek_token() {
if t == Token::Comma {
self.next_token();
} else {
break;
}
} else {
//EOF
break;
}
match self.peek_token() {
Some(Token::Comma) => self.next_token(),
_ => break,
};
}
Ok(expr_list)
}
/// Parse a comma-delimited list of projections after SELECT
pub fn parse_select_list(&mut self) -> Result<Vec<SQLSelectItem>, ParserError> {
let mut projections: Vec<SQLSelectItem> = vec![];
loop {
let expr = self.parse_expr()?;
if let ASTNode::SQLWildcard = expr {
projections.push(SQLSelectItem::Wildcard);
} else if let ASTNode::SQLQualifiedWildcard(prefix) = expr {
projections.push(SQLSelectItem::QualifiedWildcard(SQLObjectName(prefix)));
} else {
// `expr` is a regular SQL expression and can be followed by an alias
if let Some(alias) =
self.parse_optional_alias(keywords::RESERVED_FOR_COLUMN_ALIAS)?
{
projections.push(SQLSelectItem::ExpressionWithAlias(expr, alias));
} else {
projections.push(SQLSelectItem::UnnamedExpression(expr));
}
}
match self.peek_token() {
Some(Token::Comma) => self.next_token(),
_ => break,
};
}
Ok(projections)
}
/// Parse a comma-delimited list of SQL ORDER BY expressions
pub fn parse_order_by_expr_list(&mut self) -> Result<Vec<SQLOrderByExpr>, ParserError> {
let mut expr_list: Vec<SQLOrderByExpr> = vec![];