Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1097,16 +1097,17 @@ impl<'a> Parser<'a> {
FlushType::Logs
} else if self.parse_keywords(&[Keyword::TABLES]) {
loop {
let next_token = self.next_token();
let next_token = self.peek_token();
match &next_token.token {
Token::Word(w) if w.keyword == Keyword::WITH => {
self.advance_token();
read_lock = self.parse_keywords(&[Keyword::READ, Keyword::LOCK]);
}
Token::Word(w) if w.keyword == Keyword::FOR => {
self.advance_token();
export = self.parse_keyword(Keyword::EXPORT);
}
Token::Word(_) => {
self.prev_token();
Token::Word(_) if tables.is_empty() && !read_lock && !export => {
tables = self.parse_comma_separated(|p| p.parse_object_name(false))?;
}
_ => break,
Expand Down
20 changes: 20 additions & 0 deletions tests/sqlparser_mysql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,26 @@ fn parse_flush_preserves_keyword_table_names() {
}
}

#[test]
fn parse_flush_tables_followed_by_statement() {
for sql in [
"FLUSH TABLES; SELECT 1",
"FLUSH TABLES t1, t2; SELECT 1",
"FLUSH TABLES WITH READ LOCK; SELECT 1",
"FLUSH TABLES t1, t2 WITH READ LOCK; SELECT 1",
"FLUSH TABLES t1, t2 FOR EXPORT; SELECT 1",
] {
let stmts = mysql_and_generic().parse_sql_statements(sql).unwrap();
assert_eq!(
stmts.len(),
2,
"Failed to parse multiple statements for: {sql}"
);
assert!(matches!(stmts[0], Statement::Flush { .. }));
assert!(matches!(stmts[1], Statement::Query { .. }));
}
}

#[test]
fn parse_show_columns() {
assert_eq!(
Expand Down
Loading