Skip to content

Allow semi-colon at the end of UNCACHE statement #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alamb merged 2 commits into from
Jun 23, 2024
Merged

Allow semi-colon at the end of UNCACHE statement #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9321ef
change tests
LorrensP-2158466 Jun 22, 2024
d34eae9
fix merge conflict
LorrensP-2158466 Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3611,21 +3611,13 @@ impl<'a> Parser<'a> {

/// Parse a UNCACHE TABLE statement
pub fn parse_uncache_table(&mut self) -> Result<Statement, ParserError> {
let has_table = self.parse_keyword(Keyword::TABLE);
if has_table {
let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]);
let table_name = self.parse_object_name(false)?;
if self.peek_token().token == Token::EOF {
Ok(Statement::UNCache {
table_name,
if_exists,
})
} else {
self.expected("an `EOF`", self.peek_token())
}
} else {
self.expected("a `TABLE` keyword", self.peek_token())
}
self.expect_keyword(Keyword::TABLE)?;
let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]);
Copy link
Contributor

@alamb alamb Jun 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

let table_name = self.parse_object_name(false)?;
Ok(Statement::UNCache {
table_name,
if_exists,
})
}

/// SQLite-specific `CREATE VIRTUAL TABLE`
Expand Down
6 changes: 3 additions & 3 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8451,19 +8451,19 @@ fn parse_uncache_table() {

let res = parse_sql_statements("UNCACHE TABLE 'table_name' foo");
assert_eq!(
ParserError::ParserError("Expected: an `EOF`, found: foo".to_string()),
ParserError::ParserError("Expected: end of statement, found: foo".to_string()),
res.unwrap_err()
);

let res = parse_sql_statements("UNCACHE 'table_name' foo");
assert_eq!(
ParserError::ParserError("Expected: a `TABLE` keyword, found: 'table_name'".to_string()),
ParserError::ParserError("Expected: TABLE, found: 'table_name'".to_string()),
res.unwrap_err()
);

let res = parse_sql_statements("UNCACHE IF EXISTS 'table_name' foo");
assert_eq!(
ParserError::ParserError("Expected: a `TABLE` keyword, found: IF".to_string()),
ParserError::ParserError("Expected: TABLE, found: IF".to_string()),
res.unwrap_err()
);
}
Expand Down