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

Add SQLOrderBy struct to replace ASTNode::OrderByExpr

Browse source
This commit is contained in:
Andy Grove 2018-09-08 08:09:32 -06:00
parent e19d559073
commit d58e59324b
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/sqlparser.rs
View file

@ -563,8 +563,8 @@ impl Parser {
}
/// Parse a comma-delimited list of SQL ORDER BY expressions
pub fn parse_order_by_expr_list(&mut self) -> Result<Vec<ASTNode>, ParserError> {
let mut expr_list: Vec<ASTNode> = vec![];
pub fn parse_order_by_expr_list(&mut self) -> Result<Vec<SQLOrderByExpr>, ParserError> {
let mut expr_list: Vec<SQLOrderByExpr> = vec![];
loop {
let expr = self.parse_expr(0)?;
@ -590,10 +590,7 @@ impl Parser {
None => true,
};
expr_list.push(ASTNode::SQLOrderBy {
expr: Box::new(expr),
asc,
});
expr_list.push(SQLOrderByExpr::new(Box::new(expr),asc));
if let Some(t) = self.peek_token() {
if t == Token::Comma {
@ -805,11 +802,11 @@ mod tests {
ASTNode::SQLSelect { order_by, .. } => {
assert_eq!(
Some(vec![
ASTNode::SQLOrderBy {
SQLOrderByExpr {
expr: Box::new(ASTNode::SQLIdentifier("lname".to_string())),
asc: true,
},
ASTNode::SQLOrderBy {
SQLOrderByExpr {
expr: Box::new(ASTNode::SQLIdentifier("fname".to_string())),
asc: false,
},