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

Add and use expect_keywords function

Browse source 
The code for parsing chains of expected keywords is more readable with
this helper function.

Co-authored-by: Nikhil Benesch <nikhil.benesch@gmail.com>
This commit is contained in:
Brennan Vincent 2019-08-05 12:21:52 -04:00 • committed by Nikhil Benesch
parent 391a54b5a3
commit 41d4ea480f
No known key found for this signature in database
GPG key ID: FCF98542083C5A69
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/parser.rs
View file

@ -802,6 +802,15 @@ impl Parser {
}
}
/// Bail out if the following tokens are not the expected sequence of
/// keywords, or consume them if they are.
pub fn expect_keywords(&mut self, expected: &[&'static str]) -> Result<(), ParserError> {
for kw in expected {
self.expect_keyword(kw)?;
}
Ok(())
}
/// Consume the next token if it matches the expected token, otherwise return false
#[must_use]
pub fn consume_token(&mut self, expected: &Token) -> bool {
@ -856,8 +865,7 @@ impl Parser {
self.expect_keyword("TABLE")?;
let table_name = self.parse_object_name()?;
let (columns, constraints) = self.parse_columns()?;
self.expect_keyword("STORED")?;
self.expect_keyword("AS")?;
self.expect_keywords(&["STORED", "AS"])?;
let file_format = self.parse_identifier()?.parse::<FileFormat>()?;
self.expect_keyword("LOCATION")?;
@ -1111,8 +1119,7 @@ impl Parser {
pub fn parse_copy(&mut self) -> Result<Statement, ParserError> {
let table_name = self.parse_object_name()?;
let columns = self.parse_parenthesized_column_list(Optional)?;
self.expect_keyword("FROM")?;
self.expect_keyword("STDIN")?;
self.expect_keywords(&["FROM", "STDIN"])?;
self.expect_token(&Token::SemiColon)?;
let values = self.parse_tsv()?;
Ok(Statement::Copy {
@ -1240,16 +1247,14 @@ impl Parser {
"TIMESTAMP" => {
// TBD: we throw away "with/without timezone" information
if self.parse_keyword("WITH") || self.parse_keyword("WITHOUT") {
self.expect_keyword("TIME")?;
self.expect_keyword("ZONE")?;
self.expect_keywords(&["TIME", "ZONE"])?;
}
Ok(DataType::Timestamp)
}
"TIME" => {
// TBD: we throw away "with/without timezone" information
if self.parse_keyword("WITH") || self.parse_keyword("WITHOUT") {
self.expect_keyword("TIME")?;
self.expect_keyword("ZONE")?;
self.expect_keywords(&["TIME", "ZONE"])?;
}
Ok(DataType::Time)
}