Fix GO failing to find following newline

Author: aharpervc

src/parser/mod.rs

@@ -19736,11 +19736,27 @@ impl<'a> Parser<'a> {
             };
         };
 
-        if self.peek_token().token == Token::SemiColon {
-            parser_err!(
-                "GO may not end with a semicolon",
-                self.peek_token().span.start
-            )?;
+        loop {
+            let next_token = self.peek_token_no_skip();
+            match next_token.token {
+                Token::EOF => break,
+                Token::Whitespace(ref w) => match w {
+                    Whitespace::Newline => break,
+                    Whitespace::SingleLineComment { comment, prefix: _ } => {
+                        if comment.ends_with('\n') {
+                            break;
+                        }
+                        _ = self.next_token_no_skip();
+                    }
+                    _ => _ = self.next_token_no_skip(),
+                },
+                _ => {
+                    parser_err!(
+                        "GO must be followed by a newline or EOF",
+                        self.peek_token().span.start
+                    )?;
+                }
+            };
         }
 
         Ok(Statement::Go(GoStatement { count }))

tests/sqlparser_mssql.rs

@@ -2928,10 +2928,9 @@ fn parse_mssql_go_keyword() {
     //     }
     // );
 
-    // let actually_column_alias_no_as = "SELECT NULL GO";
-    // let stmts = ms().parse_sql_statements(actually_column_alias_no_as).unwrap();
-    // assert_eq!(stmts.len(), 1);
-    // match &stmts[0] {
+    // let actually_column_alias = "SELECT NULL GO";
+    // let stmt = ms().one_statement_parses_to(actually_column_alias, "SELECT NULL AS GO");
+    // match &stmt {
     //     Statement::Query(query) => {
     //         let select = query.body.as_select().unwrap();
     //         assert_eq!(
@@ -2945,6 +2944,11 @@ fn parse_mssql_go_keyword() {
     //     _ => panic!("Expected Query statement"),
     // }
 
+    let cte_following_go = "USE some_database;\nGO\n;WITH cte AS (\nSELECT 1 x\n)\nSELECT * FROM cte;";
+    let stmts = ms().parse_sql_statements(cte_following_go).unwrap();
+    assert_eq!(stmts.len(), 3);
+    assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
+
     let multi_line_comment_following = "USE some_database;\nGO/* okay */42";
     let stmts =
         ms().statements_parse_to(multi_line_comment_following, 2, "USE some_database\nGO 42");
@@ -2963,6 +2967,13 @@ fn parse_mssql_go_keyword() {
         err.unwrap_err().to_string(),
         "sql parser error: Expected: literal int or newline, found: x"
     );
+
+    let invalid_go_delimiter = "SELECT 1\nGO;";
+    let err = ms().parse_sql_statements(invalid_go_delimiter);
+    assert_eq!(
+        err.unwrap_err().to_string(),
+        "sql parser error: Expected: literal int or newline, found: ;"
+    );
 }
 
 #[test]