@@ -24,7 +24,7 @@ use datafusion_common::DataFusionError;
2424use datafusion_common:: config:: { ConfigNonZeroUsize , SqlParserOptions } ;
2525use datafusion_common:: format:: { ExplainFormat , ExplainStatementOptions } ;
2626use datafusion_common:: { Diagnostic , Span , sql_err} ;
27- use sqlparser:: ast:: { ExprWithAlias , Ident , OrderByOptions , OrderBySort } ;
27+ use sqlparser:: ast:: { ExprWithAlias , Ident , ObjectType , OrderByOptions , OrderBySort } ;
2828use sqlparser:: tokenizer:: TokenWithSpan ;
2929use sqlparser:: {
3030 ast:: {
@@ -369,6 +369,8 @@ pub struct DropCatalog {
369369 pub name : ObjectName ,
370370 /// Option to not error if the catalog does not exist
371371 pub if_exists : bool ,
372+ /// Whether drop should cascade
373+ pub cascade : bool ,
372374}
373375
374376impl fmt:: Display for DropCatalog {
@@ -411,8 +413,6 @@ pub enum Statement {
411413 CreateExternalTable ( CreateExternalTable ) ,
412414 /// Extension: `CREATE EXTERNAL CATALOG`
413415 CreateExternalCatalog ( CreateExternalCatalog ) ,
414- /// Extension: `DROP CATALOG`
415- DropCatalog ( DropCatalog ) ,
416416 /// Extension: `COPY TO`
417417 CopyTo ( CopyToStatement ) ,
418418 /// EXPLAIN for extensions
@@ -427,7 +427,6 @@ impl fmt::Display for Statement {
427427 Statement :: Statement ( stmt) => write ! ( f, "{stmt}" ) ,
428428 Statement :: CreateExternalTable ( stmt) => write ! ( f, "{stmt}" ) ,
429429 Statement :: CreateExternalCatalog ( stmt) => write ! ( f, "{stmt}" ) ,
430- Statement :: DropCatalog ( stmt) => write ! ( f, "{stmt}" ) ,
431430 Statement :: CopyTo ( stmt) => write ! ( f, "{stmt}" ) ,
432431 Statement :: Explain ( stmt) => write ! ( f, "{stmt}" ) ,
433432 Statement :: Reset ( stmt) => write ! ( f, "{stmt}" ) ,
@@ -1036,6 +1035,10 @@ impl<'a> DFParser<'a> {
10361035 . parse_keywords ( & [ Keyword :: UNBOUNDED , Keyword :: EXTERNAL ] )
10371036 {
10381037 self . parse_create_external ( true , false )
1038+ } else if self . parser . parse_keywords ( & [ Keyword :: CATALOG ] ) {
1039+ Ok ( Statement :: Statement ( Box :: from (
1040+ self . parser . parse_create_database ( ) ?,
1041+ ) ) )
10391042 } else {
10401043 Ok ( Statement :: Statement ( Box :: from ( self . parser . parse_create ( ) ?) ) )
10411044 }
@@ -1431,7 +1434,28 @@ impl<'a> DFParser<'a> {
14311434 fn parse_drop_catalog ( & mut self ) -> Result < Statement , DataFusionError > {
14321435 let if_exists = self . parser . parse_keywords ( & [ Keyword :: IF , Keyword :: EXISTS ] ) ;
14331436 let name = self . parser . parse_object_name ( true ) ?;
1434- Ok ( Statement :: DropCatalog ( DropCatalog { name, if_exists } ) )
1437+
1438+ let loc = self . parser . peek_token_ref ( ) . span . start ;
1439+ let cascade = self . parser . parse_keyword ( Keyword :: CASCADE ) ;
1440+ let restrict = self . parser . parse_keyword ( Keyword :: RESTRICT ) ;
1441+ if cascade && restrict {
1442+ return parser_err ! ( format!(
1443+ "Cannot specify both CASCADE and RESTRICT in DROP DATABASE {loc}"
1444+ ) ) ;
1445+ }
1446+
1447+ Ok ( Statement :: Statement ( Box :: new (
1448+ sqlparser:: ast:: Statement :: Drop {
1449+ object_type : ObjectType :: Database ,
1450+ if_exists,
1451+ names : vec ! [ name] ,
1452+ cascade,
1453+ restrict,
1454+ purge : false ,
1455+ temporary : false ,
1456+ table : None ,
1457+ } ,
1458+ ) ) )
14351459 }
14361460
14371461 /// Parses one or more external table locations.
@@ -2108,26 +2132,56 @@ mod tests {
21082132 #[ test]
21092133 fn drop_catalog ( ) -> Result < ( ) , DataFusionError > {
21102134 let sql = "DROP CATALOG c" ;
2111- let expected = Statement :: DropCatalog ( DropCatalog {
2112- name : ObjectName :: from ( vec ! [ Ident :: from ( "c" ) ] ) ,
2135+ let expected = Statement :: Statement ( Box :: new ( sqlparser :: ast :: Statement :: Drop {
2136+ object_type : ObjectType :: Database ,
21132137 if_exists : false ,
2114- } ) ;
2138+ names : vec ! [ ObjectName :: from( vec![ Ident :: from( "c" ) ] ) ] ,
2139+ cascade : false ,
2140+ restrict : false ,
2141+ purge : false ,
2142+ temporary : false ,
2143+ table : None ,
2144+ } ) ) ;
21152145 expect_parse_ok ( sql, expected) ?;
21162146
21172147 let sql = "DROP CATALOG IF EXISTS c" ;
2118- let expected = Statement :: DropCatalog ( DropCatalog {
2119- name : ObjectName :: from ( vec ! [ Ident :: from ( "c" ) ] ) ,
2148+ let expected = Statement :: Statement ( Box :: new ( sqlparser :: ast :: Statement :: Drop {
2149+ object_type : ObjectType :: Database ,
21202150 if_exists : true ,
2121- } ) ;
2151+ names : vec ! [ ObjectName :: from( vec![ Ident :: from( "c" ) ] ) ] ,
2152+ cascade : false ,
2153+ restrict : false ,
2154+ purge : false ,
2155+ temporary : false ,
2156+ table : None ,
2157+ } ) ) ;
2158+ expect_parse_ok ( sql, expected) ?;
2159+
2160+ let sql = "DROP CATALOG c CASCADE" ;
2161+ let expected = Statement :: Statement ( Box :: new ( sqlparser:: ast:: Statement :: Drop {
2162+ object_type : ObjectType :: Database ,
2163+ if_exists : false ,
2164+ names : vec ! [ ObjectName :: from( vec![ Ident :: from( "c" ) ] ) ] ,
2165+ cascade : true ,
2166+ restrict : false ,
2167+ purge : false ,
2168+ temporary : false ,
2169+ table : None ,
2170+ } ) ) ;
21222171 expect_parse_ok ( sql, expected) ?;
21232172
2124- // DROP TABLE / VIEW / SCHEMA are unaffected by the DROP EXTERNAL
2125- // CATALOG dispatch and continue to use the native parser.
2126- let sql = "DROP TABLE t" ;
2127- assert ! ( matches!(
2128- DFParser :: parse_sql( sql) ?. pop_front( ) ,
2129- Some ( Statement :: Statement ( _) )
2130- ) ) ;
2173+ let sql = "DROP CATALOG IF EXISTS c CASCADE" ;
2174+ let expected = Statement :: Statement ( Box :: new ( sqlparser:: ast:: Statement :: Drop {
2175+ object_type : ObjectType :: Database ,
2176+ if_exists : true ,
2177+ names : vec ! [ ObjectName :: from( vec![ Ident :: from( "c" ) ] ) ] ,
2178+ cascade : true ,
2179+ restrict : false ,
2180+ purge : false ,
2181+ temporary : false ,
2182+ table : None ,
2183+ } ) ) ;
2184+ expect_parse_ok ( sql, expected) ?;
21312185
21322186 Ok ( ( ) )
21332187 }
0 commit comments