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

Make SQLOrderByExpr::asc tri-state

Browse source 
i.e. ASC/DESC/unspecified - so that we don't lose information about
source code.

Also don't take any keyword other than ASC/DESC or Comma to mean
'ascending'.
This commit is contained in:
Nickolay Ponomarev 2019-01-13 03:26:33 +03:00
parent 12b9f5aafc
commit 3de2a0952c
3 changed files with 23 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/sqlparser.rs
View file

@ -1321,33 +1321,19 @@ impl Parser {
loop {
let expr = self.parse_expr(0)?;
// look for optional ASC / DESC specifier
let asc = match self.peek_token() {
Some(Token::Keyword(k)) => match k.to_uppercase().as_ref() {
"ASC" => {
self.next_token();
true
}
"DESC" => {
self.next_token();
false
}
_ => true,
},
Some(Token::Comma) => true,
_ => true,
let asc = if self.parse_keyword("ASC") {
Some(true)
} else if self.parse_keyword("DESC") {
Some(false)
} else {
None
};
expr_list.push(SQLOrderByExpr::new(Box::new(expr), asc));
if let Some(t) = self.peek_token() {
if t == Token::Comma {
self.next_token();
} else {
break;
}
if let Some(Token::Comma) = self.peek_token() {
self.next_token();
} else {
// EOF
break;
}
}