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

Use self.expected() more

Browse source
This commit is contained in:
Nickolay Ponomarev 2019-06-13 11:15:10 +03:00
parent f18fbe5cda
commit 45c9aa1cc2
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/sqlparser.rs
View file

@ -890,10 +890,7 @@ impl Parser {
} else if self.parse_keyword("VIEW") { } else if self.parse_keyword("VIEW") {
SQLObjectType::View SQLObjectType::View
} else { } else {
return parser_err!(format!( return self.expected("TABLE or VIEW after DROP", self.peek_token());
"Unexpected token after DROP: {:?}",
self.peek_token()
));
}; };
let if_exists = self.parse_keywords(vec!["IF", "EXISTS"]); let if_exists = self.parse_keywords(vec!["IF", "EXISTS"]);
let mut names = vec![]; let mut names = vec![];
@ -1015,10 +1012,7 @@ impl Parser {
self.expect_token(&Token::RParen)?; self.expect_token(&Token::RParen)?;
ColumnOption::Check(expr) ColumnOption::Check(expr)
} else { } else {
return parser_err!(format!( return self.expected("column option", self.peek_token());
"Unexpected token in column definition: {:?}",
self.peek_token()
));
}; };
Ok(ColumnOptionDef { name, option }) Ok(ColumnOptionDef { name, option })
@ -1216,7 +1210,7 @@ impl Parser {
pub fn parse_literal_string(&mut self) -> Result<String, ParserError> { pub fn parse_literal_string(&mut self) -> Result<String, ParserError> {
match self.next_token() { match self.next_token() {
Some(Token::SingleQuotedString(ref s)) => Ok(s.clone()), Some(Token::SingleQuotedString(ref s)) => Ok(s.clone()),
other => parser_err!(format!("Expected literal string, found {:?}", other)), other => self.expected("literal string", other),
} }
} }

2
tests/sqlparser_common.rs
View file

@ -949,7 +949,7 @@ fn parse_create_table() {
assert!(res assert!(res
.unwrap_err() .unwrap_err()
.to_string() .to_string()
.contains("Unexpected token in column definition")); .contains("Expected column option, found: GARBAGE"));
} }
#[test] #[test]