@@ -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]
@@ -2511,23 +2511,23 @@ DECLARE @Y AS NVARCHAR(MAX)='y'
25112511#[ test]
25122512fn parse_mssql_go_keyword ( ) {
25132513 let single_go_keyword = "USE some_database;\n GO" ;
2514- let stmts = ms ( ) . multiple_statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
2514+ let stmts = ms ( ) . statements_parse_to ( single_go_keyword, 2 , "USE some_database\n GO" ) ;
25152515 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25162516
25172517 let go_with_count = "SELECT 1;\n GO 5" ;
2518- let stmts = ms ( ) . multiple_statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
2518+ let stmts = ms ( ) . statements_parse_to ( go_with_count, 2 , "SELECT 1\n GO 5" ) ;
25192519 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
25202520
25212521 let go_statement_delimiter = "SELECT 1\n GO" ;
2522- let stmts = ms ( ) . multiple_statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
2522+ let stmts = ms ( ) . statements_parse_to ( go_statement_delimiter, 2 , "SELECT 1; \n GO" ) ;
25232523 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25242524
25252525 let bare_go = "GO" ;
25262526 let stmt = ms ( ) . one_statement_parses_to ( bare_go, "GO" ) ;
25272527 assert_eq ! ( stmt, Statement :: Go ( GoStatement { count: None } ) ) ;
25282528
25292529 let go_then_statements = "/* whitespace */ GO\n RAISERROR('This is a test', 16, 1);" ;
2530- let stmts = ms ( ) . multiple_statements_parse_to (
2530+ let stmts = ms ( ) . statements_parse_to (
25312531 go_then_statements,
25322532 2 ,
25332533 "GO\n RAISERROR('This is a test', 16, 1)" ,
@@ -2547,40 +2547,28 @@ fn parse_mssql_go_keyword() {
25472547 ) ;
25482548
25492549 let multiple_gos = "SELECT 1;\n GO 5\n SELECT 2;\n GO" ;
2550- let stmts = ms ( ) . multiple_statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
2550+ let stmts = ms ( ) . statements_parse_to ( multiple_gos, 4 , "SELECT 1\n GO 5\n SELECT 2\n GO" ) ;
25512551 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
25522552 assert_eq ! ( stmts[ 3 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25532553
25542554 let single_line_comment_preceding_go = "USE some_database; -- okay\n GO" ;
2555- let stmts = ms ( ) . multiple_statements_parse_to (
2556- single_line_comment_preceding_go,
2557- 2 ,
2558- "USE some_database\n GO" ,
2559- ) ;
2555+ let stmts =
2556+ ms ( ) . statements_parse_to ( single_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
25602557 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25612558
25622559 let multi_line_comment_preceding_go = "USE some_database; /* okay */\n GO" ;
2563- let stmts = ms ( ) . multiple_statements_parse_to (
2564- multi_line_comment_preceding_go,
2565- 2 ,
2566- "USE some_database\n GO" ,
2567- ) ;
2560+ let stmts =
2561+ ms ( ) . statements_parse_to ( multi_line_comment_preceding_go, 2 , "USE some_database\n GO" ) ;
25682562 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25692563
25702564 let single_line_comment_following_go = "USE some_database;\n GO -- okay" ;
2571- let stmts = ms ( ) . multiple_statements_parse_to (
2572- single_line_comment_following_go,
2573- 2 ,
2574- "USE some_database\n GO" ,
2575- ) ;
2565+ let stmts =
2566+ ms ( ) . statements_parse_to ( single_line_comment_following_go, 2 , "USE some_database\n GO" ) ;
25762567 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
25772568
25782569 let multi_line_comment_following = "USE some_database;\n GO/* okay */42" ;
2579- let stmts = ms ( ) . multiple_statements_parse_to (
2580- multi_line_comment_following,
2581- 2 ,
2582- "USE some_database\n GO 42" ,
2583- ) ;
2570+ let stmts =
2571+ ms ( ) . statements_parse_to ( multi_line_comment_following, 2 , "USE some_database\n GO 42" ) ;
25842572 assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 42 ) } ) ) ;
25852573
25862574 let actually_column_alias = "SELECT NULL GO" ;
0 commit comments