Skip to content
Open
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
3 changes: 3 additions & 0 deletions fuzz/fuzz_seeds/spark_2801_cache_table_semicolon.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CACHE TABLE t;
CACHE LAZY TABLE t OPTIONS('storageLevel' = 'DISK_ONLY');
SELECT 1
13 changes: 7 additions & 6 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5856,12 +5856,13 @@ impl<'a> Parser<'a> {

let table_name = self.parse_object_name(false)?;
let options = self.parse_options(Keyword::OPTIONS)?;
let (has_as, query) = if self.peek_token_ref().token == Token::EOF {
(false, None)
} else {
let (has_as, query) = self.parse_as_query()?;
(has_as, Some(query))
};
let (has_as, query) =
if matches!(self.peek_token_ref().token, Token::EOF | Token::SemiColon) {
(false, None)
} else {
let (has_as, query) = self.parse_as_query()?;
(has_as, Some(query))
};

Ok(Statement::Cache {
table_flag,
Expand Down
30 changes: 30 additions & 0 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23579,3 +23579,33 @@ $$"#,
);
}
}

#[test]
fn parse_cache_table_followed_by_semicolon() {
for (sql, expected) in [
("CACHE TABLE t;", vec!["CACHE TABLE t"]),
("CACHE TABLE t; SELECT 1", vec!["CACHE TABLE t", "SELECT 1"]),
(
"CACHE LAZY TABLE t OPTIONS('storageLevel' = 'DISK_ONLY'); SELECT 1",
vec![
"CACHE LAZY TABLE t OPTIONS('storageLevel' = 'DISK_ONLY')",
"SELECT 1",
],
),
(
"CACHE TABLE t AS SELECT 1; SELECT 2",
vec!["CACHE TABLE t AS SELECT 1", "SELECT 2"],
),
] {
let statements = parse_sql_statements(sql).unwrap();
let displayed: Vec<String> = statements.iter().map(ToString::to_string).collect();
assert_eq!(displayed, expected, "{sql}");
}

assert_eq!(
parse_sql_statements("CACHE TABLE t AS; SELECT 1").unwrap_err(),
ParserError::ParserError(
"Expected: SELECT, VALUES, or a subquery in the query body, found: ;".to_string()
),
);
}
Loading