diff --git a/fuzz/fuzz_seeds/spark_2801_cache_table_semicolon.sql b/fuzz/fuzz_seeds/spark_2801_cache_table_semicolon.sql new file mode 100644 index 0000000000..71529f78b4 --- /dev/null +++ b/fuzz/fuzz_seeds/spark_2801_cache_table_semicolon.sql @@ -0,0 +1,3 @@ +CACHE TABLE t; +CACHE LAZY TABLE t OPTIONS('storageLevel' = 'DISK_ONLY'); +SELECT 1 diff --git a/src/parser/mod.rs b/src/parser/mod.rs index aba553b839..099d6e211f 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -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, diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index 1cb6e86478..ece3d2169b 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -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 = 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() + ), + ); +}