Move IF statement semi-colon logic into parse_if_stmt

- no need for special IF logic to bleed over to another function

Author: aharpervc

src/dialect/mssql.rs

@@ -169,8 +169,10 @@ impl MsSqlDialect {
             }
         };
 
+        let mut prior_statement_ended_with_semi_colon = false;
         while let Token::SemiColon = parser.peek_token_ref().token {
             parser.advance_token();
+            prior_statement_ended_with_semi_colon = true;
         }
 
         let mut else_block = None;
@@ -201,6 +203,10 @@ impl MsSqlDialect {
                     },
                 });
             }
+        } else {
+            if prior_statement_ended_with_semi_colon {
+                parser.prev_token();
+            }
         }
 
         Ok(Statement::If(IfStatement {

src/parser/mod.rs

@@ -4454,16 +4454,7 @@ impl<'a> Parser<'a> {
                 }
             }
             values.push(self.parse_statement()?);
-
-            let semi_colon_expected = match values.last() {
-                Some(Statement::If(if_statement)) => if_statement.end_token.is_some(),
-                Some(_) => true,
-                None => false,
-            };
-
-            if semi_colon_expected {
-                self.expect_token(&Token::SemiColon)?;
-            }
+            self.expect_token(&Token::SemiColon)?;
         }
         Ok(values)
     }