update and to Option

Author: zidaye

src/ast/mod.rs

@@ -1252,8 +1252,8 @@ pub enum Statement {
         if_exists: bool,
         /// One or more function to drop
         func_desc: Vec<DropFunctionDesc>,
-        cascade: bool,
-        restrict: bool,
+        /// `CASCADE` or `RESTRICT`
+        option: Option<DropFunctionOption>,
     },
     /// DECLARE - Declaring Cursor Variables
     ///
@@ -2274,16 +2274,19 @@ impl fmt::Display for Statement {
             Statement::DropFunction {
                 if_exists,
                 func_desc,
-                cascade,
-                restrict,
-            } => write!(
-                f,
-                "DROP FUNCTION{} {}{}{}",
-                if *if_exists { " IF EXISTS" } else { "" },
-                display_comma_separated(func_desc),
-                if *cascade { " CASCADE" } else { "" },
-                if *restrict { " RESTRICT" } else { "" }
-            ),
+                option,
+            } => {
+                write!(
+                    f,
+                    "DROP FUNCTION{} {}",
+                    if *if_exists { " IF EXISTS" } else { "" },
+                    display_comma_separated(func_desc),
+                )?;
+                if let Some(op) = option {
+                    write!(f, " {}", op)?;
+                }
+                Ok(())
+            }
             Statement::Discard { object_type } => {
                 write!(f, "DISCARD {object_type}", object_type = object_type)?;
                 Ok(())
@@ -3712,6 +3715,23 @@ impl fmt::Display for ContextModifier {
     }
 }
 
+/// Function describe in DROP FUNCTION.
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum DropFunctionOption {
+    Restrict,
+    Cascade,
+}
+
+impl fmt::Display for DropFunctionOption {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            DropFunctionOption::Restrict => write!(f, "RESTRICT "),
+            DropFunctionOption::Cascade => write!(f, "CASCADE  "),
+        }
+    }
+}
+
 /// Function describe in DROP FUNCTION.
 #[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]

src/parser.rs

@@ -2788,13 +2788,15 @@ impl<'a> Parser<'a> {
     fn parse_drop_function(&mut self) -> Result<Statement, ParserError> {
         let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]);
         let func_desc = self.parse_comma_separated(Parser::parse_drop_function_desc)?;
-        let cascade = self.parse_keyword(Keyword::CASCADE);
-        let restrict = self.parse_keyword(Keyword::RESTRICT);
+        let option = match self.parse_one_of_keywords(&[Keyword::CASCADE, Keyword::RESTRICT]) {
+            Some(Keyword::CASCADE) => Some(DropFunctionOption::Cascade),
+            Some(Keyword::RESTRICT) => Some(DropFunctionOption::Restrict),
+            _ => None,
+        };
         Ok(Statement::DropFunction {
             if_exists,
             func_desc,
-            cascade,
-            restrict,
+            option,
         })
     }
 

tests/sqlparser_postgres.rs

@@ -2308,8 +2308,7 @@ fn parse_drop_function() {
                 }]),
                 args: None
             }],
-            cascade: false,
-            restrict: false
+            option: None
         }
     );
 
@@ -2333,8 +2332,7 @@ fn parse_drop_function() {
                     }
                 ]),
             }],
-            cascade: false,
-            restrict: false
+            option: None
         }
     );
 
@@ -2381,8 +2379,7 @@ fn parse_drop_function() {
                     ]),
                 }
             ],
-            cascade: false,
-            restrict: false
+            option: None
         }
     );
 }