@@ -1566,7 +1566,7 @@ fn test_mssql_cursor() {
15661566 CLOSE Employee_Cursor; \
15671567 DEALLOCATE Employee_Cursor\
15681568 ";
1569- let _ = ms ( ) . multiple_statements_parse_to ( full_cursor_usage, 6 , "" ) ;
1569+ let _ = ms ( ) . statements_parse_to ( full_cursor_usage, 6 , "" ) ;
15701570}
15711571
15721572#[ test]
@@ -2527,23 +2527,23 @@ DECLARE @Y AS NVARCHAR(MAX)='y'
25272527#[ test]
25282528fn parse_mssql_go_keyword ( ) {
25292529 let single_go_keyword = "USE some_database;\n GO" ;
2530- let stmts = ms ( ) . multiple_statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
2530+ let stmts = ms ( ) . statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
25312531 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25322532
25332533 let go_with_count = "SELECT 1;\n GO 5" ;
2534- let stmts = ms ( ) . multiple_statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
2534+ let stmts = ms ( ) . statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
25352535 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
25362536
25372537 let go_statement_delimiter = "SELECT 1\n GO" ;
2538- let stmts = ms ( ) . multiple_statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
2538+ let stmts = ms ( ) . statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
25392539 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25402540
25412541 let bare_go = "GO" ;
25422542 let stmt = ms ( ) . one_statement_parses_to ( bare_go, "GO" ) ;
25432543 assert_eq ! ( stmt, Statement :: Go ( GoStatement { count: None } ) ) ;
25442544
25452545 let go_then_statements = "/* whitespace */ GO\n RAISERROR('This is a test', 16, 1);" ;
2546- let stmts = ms ( ) . multiple_statements_parse_to (
2546+ let stmts = ms ( ) . statements_parse_to (
25472547 go_then_statements,
25482548 2 ,
25492549 "GO\n RAISERROR('This is a test', 16, 1)" ,
@@ -2563,40 +2563,28 @@ fn parse_mssql_go_keyword() {
25632563 ) ;
25642564
25652565 let multiple_gos = "SELECT 1;\n GO 5\n SELECT 2;\n GO" ;
2566- let stmts = ms ( ) . multiple_statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
2566+ let stmts = ms ( ) . statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
25672567 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
25682568 assert_eq ! ( stmts[ 3 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25692569
25702570 let single_line_comment_preceding_go = "USE some_database; -- okay\n GO" ;
2571- let stmts = ms ( ) . multiple_statements_parse_to (
2572- single_line_comment_preceding_go,
2573- 2 ,
2574- "USE some_database\n GO" ,
2575- ) ;
2571+ let stmts =
2572+ ms ( ) . statements_parse_to ( single_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
25762573 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25772574
25782575 let multi_line_comment_preceding_go = "USE some_database; /* okay */\n GO" ;
2579- let stmts = ms ( ) . multiple_statements_parse_to (
2580- multi_line_comment_preceding_go,
2581- 2 ,
2582- "USE some_database\n GO" ,
2583- ) ;
2576+ let stmts =
2577+ ms ( ) . statements_parse_to ( multi_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
25842578 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25852579
25862580 let single_line_comment_following_go = "USE some_database;\n GO -- okay" ;
2587- let stmts = ms ( ) . multiple_statements_parse_to (
2588- single_line_comment_following_go,
2589- 2 ,
2590- "USE some_database\n GO" ,
2591- ) ;
2581+ let stmts =
2582+ ms ( ) . statements_parse_to ( single_line_comment_following_go, 2 , "USE some_database\n GO" ) ;
25922583 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25932584
25942585 let multi_line_comment_following = "USE some_database;\n GO/* okay */42" ;
2595- let stmts = ms ( ) . multiple_statements_parse_to (
2596- multi_line_comment_following,
2597- 2 ,
2598- "USE some_database\n GO 42" ,
2599- ) ;
2586+ let stmts =
2587+ ms ( ) . statements_parse_to ( multi_line_comment_following, 2 , "USE some_database\n GO 42" ) ;
26002588 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 42 ) } ) ) ;
26012589
26022590 let actually_column_alias = "SELECT NULL GO" ;
0 commit comments