Add parse_conditional_statements & use it

Author: aharpervc

src/dialect/mssql.rs

@@ -240,22 +240,7 @@ impl MsSqlDialect {
         let events = parser.parse_comma_separated(Parser::parse_trigger_event)?;
 
         parser.expect_keyword_is(Keyword::AS)?;
-
-        let trigger_statements_body = if parser.peek_keyword(Keyword::BEGIN) {
-            let begin_token = parser.expect_keyword(Keyword::BEGIN)?;
-            let statements = parser.parse_statement_list(&[Keyword::END])?;
-            let end_token = parser.expect_keyword(Keyword::END)?;
-
-            ConditionalStatements::BeginEnd(BeginEndStatements {
-                begin_token: AttachedToken(begin_token),
-                statements,
-                end_token: AttachedToken(end_token),
-            })
-        } else {
-            ConditionalStatements::Sequence {
-                statements: parser.parse_statements()?,
-            }
-        };
+        let statements = Some(parser.parse_conditional_statements(&[Keyword::END])?);
 
         Ok(Statement::CreateTrigger {
             or_alter,
@@ -271,7 +256,7 @@ impl MsSqlDialect {
             include_each: false,
             condition: None,
             exec_body: None,
-            statements: Some(trigger_statements_body),
+            statements,
             characteristics: None,
         })
     }

src/parser/mod.rs

@@ -745,26 +745,38 @@ impl<'a> Parser<'a> {
             }
         };
 
+        let conditional_statements = self.parse_conditional_statements(terminal_keywords)?;
+
+        Ok(ConditionalStatementBlock {
+            start_token: AttachedToken(start_token),
+            condition,
+            then_token,
+            conditional_statements,
+        })
+    }
+
+    /// Parse a BEGIN/END block or a sequence of statements
+    /// This could be inside of a conditional (IF, CASE, WHILE etc.) or an object body defined optionally BEGIN/END and one or more statements.
+    pub(crate) fn parse_conditional_statements(
+        &mut self,
+        terminal_keywords: &[Keyword],
+    ) -> Result<ConditionalStatements, ParserError> {
         let conditional_statements = if self.peek_keyword(Keyword::BEGIN) {
             let begin_token = self.expect_keyword(Keyword::BEGIN)?;
             let statements = self.parse_statement_list(terminal_keywords)?;
             let end_token = self.expect_keyword(Keyword::END)?;
+
             ConditionalStatements::BeginEnd(BeginEndStatements {
                 begin_token: AttachedToken(begin_token),
                 statements,
                 end_token: AttachedToken(end_token),
             })
         } else {
-            let statements = self.parse_statement_list(terminal_keywords)?;
-            ConditionalStatements::Sequence { statements }
+            ConditionalStatements::Sequence {
+                statements: self.parse_statements()?,
+            }
         };
-
-        Ok(ConditionalStatementBlock {
-            start_token: AttachedToken(start_token),
-            condition,
-            then_token,
-            conditional_statements,
-        })
+        Ok(conditional_statements)
     }
 
     /// Parse a `RAISE` statement.