@@ -2161,23 +2161,23 @@ fn parse_print() {
21612161#[ test]
21622162fn parse_mssql_go_keyword ( ) {
21632163 let single_go_keyword = "USE some_database;\n GO" ;
2164- let stmts = ms ( ) . multiple_statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
2164+ let stmts = ms ( ) . statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
21652165 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
21662166
21672167 let go_with_count = "SELECT 1;\n GO 5" ;
2168- let stmts = ms ( ) . multiple_statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
2168+ let stmts = ms ( ) . statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
21692169 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
21702170
21712171 let go_statement_delimiter = "SELECT 1\n GO" ;
2172- let stmts = ms ( ) . multiple_statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
2172+ let stmts = ms ( ) . statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
21732173 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
21742174
21752175 let bare_go = "GO" ;
21762176 let stmt = ms ( ) . one_statement_parses_to ( bare_go, "GO" ) ;
21772177 assert_eq ! ( stmt, Statement :: Go ( GoStatement { count: None } ) ) ;
21782178
21792179 let go_then_statements = "/* whitespace */ GO\n RAISERROR('This is a test', 16, 1);" ;
2180- let stmts = ms ( ) . multiple_statements_parse_to (
2180+ let stmts = ms ( ) . statements_parse_to (
21812181 go_then_statements,
21822182 2 ,
21832183 "GO\n RAISERROR('This is a test', 16, 1)" ,
@@ -2197,40 +2197,28 @@ fn parse_mssql_go_keyword() {
21972197 ) ;
21982198
21992199 let multiple_gos = "SELECT 1;\n GO 5\n SELECT 2;\n GO" ;
2200- let stmts = ms ( ) . multiple_statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
2200+ let stmts = ms ( ) . statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
22012201 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
22022202 assert_eq ! ( stmts[ 3 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
22032203
22042204 let single_line_comment_preceding_go = "USE some_database; -- okay\n GO" ;
2205- let stmts = ms ( ) . multiple_statements_parse_to (
2206- single_line_comment_preceding_go,
2207- 2 ,
2208- "USE some_database\n GO" ,
2209- ) ;
2205+ let stmts =
2206+ ms ( ) . statements_parse_to ( single_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
22102207 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
22112208
22122209 let multi_line_comment_preceding_go = "USE some_database; /* okay */\n GO" ;
2213- let stmts = ms ( ) . multiple_statements_parse_to (
2214- multi_line_comment_preceding_go,
2215- 2 ,
2216- "USE some_database\n GO" ,
2217- ) ;
2210+ let stmts =
2211+ ms ( ) . statements_parse_to ( multi_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
22182212 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
22192213
22202214 let single_line_comment_following_go = "USE some_database;\n GO -- okay" ;
2221- let stmts = ms ( ) . multiple_statements_parse_to (
2222- single_line_comment_following_go,
2223- 2 ,
2224- "USE some_database\n GO" ,
2225- ) ;
2215+ let stmts =
2216+ ms ( ) . statements_parse_to ( single_line_comment_following_go, 2 , "USE some_database\n GO" ) ;
22262217 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
22272218
22282219 let multi_line_comment_following = "USE some_database;\n GO/* okay */42" ;
2229- let stmts = ms ( ) . multiple_statements_parse_to (
2230- multi_line_comment_following,
2231- 2 ,
2232- "USE some_database\n GO 42" ,
2233- ) ;
2220+ let stmts =
2221+ ms ( ) . statements_parse_to ( multi_line_comment_following, 2 , "USE some_database\n GO 42" ) ;
22342222 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 42 ) } ) ) ;
22352223
22362224 let actually_column_alias = "SELECT NULL GO" ;
0 commit comments