@@ -2075,23 +2075,23 @@ fn parse_print() {
2075
2075
#[ test]
2076
2076
fn parse_mssql_go_keyword ( ) {
2077
2077
let single_go_keyword = "USE some_database;\n GO" ;
2078
- let stmts = ms ( ) . multiple_statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
2078
+ let stmts = ms ( ) . statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
2079
2079
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2080
2080
2081
2081
let go_with_count = "SELECT 1;\n GO 5" ;
2082
- let stmts = ms ( ) . multiple_statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
2082
+ let stmts = ms ( ) . statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
2083
2083
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
2084
2084
2085
2085
let go_statement_delimiter = "SELECT 1\n GO" ;
2086
- let stmts = ms ( ) . multiple_statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
2086
+ let stmts = ms ( ) . statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
2087
2087
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2088
2088
2089
2089
let bare_go = "GO" ;
2090
2090
let stmt = ms ( ) . one_statement_parses_to ( bare_go, "GO" ) ;
2091
2091
assert_eq ! ( stmt, Statement :: Go ( GoStatement { count: None } ) ) ;
2092
2092
2093
2093
let go_then_statements = "/* whitespace */ GO\n RAISERROR('This is a test', 16, 1);" ;
2094
- let stmts = ms ( ) . multiple_statements_parse_to (
2094
+ let stmts = ms ( ) . statements_parse_to (
2095
2095
go_then_statements,
2096
2096
2 ,
2097
2097
"GO\n RAISERROR('This is a test', 16, 1)" ,
@@ -2111,40 +2111,28 @@ fn parse_mssql_go_keyword() {
2111
2111
) ;
2112
2112
2113
2113
let multiple_gos = "SELECT 1;\n GO 5\n SELECT 2;\n GO" ;
2114
- let stmts = ms ( ) . multiple_statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
2114
+ let stmts = ms ( ) . statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
2115
2115
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
2116
2116
assert_eq ! ( stmts[ 3 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2117
2117
2118
2118
let single_line_comment_preceding_go = "USE some_database; -- okay\n GO" ;
2119
- let stmts = ms ( ) . multiple_statements_parse_to (
2120
- single_line_comment_preceding_go,
2121
- 2 ,
2122
- "USE some_database\n GO" ,
2123
- ) ;
2119
+ let stmts =
2120
+ ms ( ) . statements_parse_to ( single_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
2124
2121
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2125
2122
2126
2123
let multi_line_comment_preceding_go = "USE some_database; /* okay */\n GO" ;
2127
- let stmts = ms ( ) . multiple_statements_parse_to (
2128
- multi_line_comment_preceding_go,
2129
- 2 ,
2130
- "USE some_database\n GO" ,
2131
- ) ;
2124
+ let stmts =
2125
+ ms ( ) . statements_parse_to ( multi_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
2132
2126
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2133
2127
2134
2128
let single_line_comment_following_go = "USE some_database;\n GO -- okay" ;
2135
- let stmts = ms ( ) . multiple_statements_parse_to (
2136
- single_line_comment_following_go,
2137
- 2 ,
2138
- "USE some_database\n GO" ,
2139
- ) ;
2129
+ let stmts =
2130
+ ms ( ) . statements_parse_to ( single_line_comment_following_go, 2 , "USE some_database\n GO" ) ;
2140
2131
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2141
2132
2142
2133
let multi_line_comment_following = "USE some_database;\n GO/* okay */42" ;
2143
- let stmts = ms ( ) . multiple_statements_parse_to (
2144
- multi_line_comment_following,
2145
- 2 ,
2146
- "USE some_database\n GO 42" ,
2147
- ) ;
2134
+ let stmts =
2135
+ ms ( ) . statements_parse_to ( multi_line_comment_following, 2 , "USE some_database\n GO 42" ) ;
2148
2136
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 42 ) } ) ) ;
2149
2137
2150
2138
let actually_column_alias = "SELECT NULL GO" ;
0 commit comments