@@ -1566,7 +1566,7 @@ fn test_mssql_cursor() {
1566
1566
CLOSE Employee_Cursor; \
1567
1567
DEALLOCATE Employee_Cursor\
1568
1568
";
1569
- let _ = ms ( ) . multiple_statements_parse_to ( full_cursor_usage, 6 , "" ) ;
1569
+ let _ = ms ( ) . statements_parse_to ( full_cursor_usage, 6 , "" ) ;
1570
1570
}
1571
1571
1572
1572
#[ test]
@@ -2511,23 +2511,23 @@ DECLARE @Y AS NVARCHAR(MAX)='y'
2511
2511
#[ test]
2512
2512
fn parse_mssql_go_keyword ( ) {
2513
2513
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" ) ;
2515
2515
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2516
2516
2517
2517
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" ) ;
2519
2519
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
2520
2520
2521
2521
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" ) ;
2523
2523
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2524
2524
2525
2525
let bare_go = "GO" ;
2526
2526
let stmt = ms ( ) . one_statement_parses_to ( bare_go, "GO" ) ;
2527
2527
assert_eq ! ( stmt, Statement :: Go ( GoStatement { count: None } ) ) ;
2528
2528
2529
2529
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 (
2531
2531
go_then_statements,
2532
2532
2 ,
2533
2533
"GO\n RAISERROR('This is a test', 16, 1)" ,
@@ -2547,40 +2547,28 @@ fn parse_mssql_go_keyword() {
2547
2547
) ;
2548
2548
2549
2549
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" ) ;
2551
2551
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 5 ) } ) ) ;
2552
2552
assert_eq ! ( stmts[ 3 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2553
2553
2554
2554
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" ) ;
2560
2557
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2561
2558
2562
2559
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" ) ;
2568
2562
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2569
2563
2570
2564
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" ) ;
2576
2567
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: None } ) ) ;
2577
2568
2578
2569
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" ) ;
2584
2572
assert_eq ! ( stmts[ 1 ] , Statement :: Go ( GoStatement { count: Some ( 42 ) } ) ) ;
2585
2573
2586
2574
let actually_column_alias = "SELECT NULL GO" ;
0 commit comments