Skip to content

Commit fe08280

Browse files
committed
Rename multiple_statements_parse_to -> statements_parse_to
1 parent 4e35df3 commit fe08280

File tree

2 files changed

+16
-28
lines changed

2 files changed

+16
-28
lines changed

src/test_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl TestedDialects {
152152
/// 2. re-serializing the result of parsing `sql` produces the same
153153
/// `canonical` sql string
154154
///
155-
/// For multiple statements, use [`multiple_statements_parse_to`].
155+
/// For multiple statements, use [`statements_parse_to`].
156156
pub fn one_statement_parses_to(&self, sql: &str, canonical: &str) -> Statement {
157157
let mut statements = self.parse_sql_statements(sql).expect(sql);
158158
assert_eq!(statements.len(), 1);
@@ -169,7 +169,7 @@ impl TestedDialects {
169169
}
170170

171171
/// The same as [`one_statement_parses_to`] but it works for a multiple statements
172-
pub fn multiple_statements_parse_to(
172+
pub fn statements_parse_to(
173173
&self,
174174
sql: &str,
175175
statement_count: usize,

tests/sqlparser_mssql.rs

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -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]
25122512
fn parse_mssql_go_keyword() {
25132513
let single_go_keyword = "USE some_database;\nGO";
2514-
let stmts = ms().multiple_statements_parse_to(single_go_keyword, 2, "USE some_database\nGO");
2514+
let stmts = ms().statements_parse_to(single_go_keyword, 2, "USE some_database\nGO");
25152515
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
25162516

25172517
let go_with_count = "SELECT 1;\nGO 5";
2518-
let stmts = ms().multiple_statements_parse_to(go_with_count, 2, "SELECT 1\nGO 5");
2518+
let stmts = ms().statements_parse_to(go_with_count, 2, "SELECT 1\nGO 5");
25192519
assert_eq!(stmts[1], Statement::Go(GoStatement { count: Some(5) }));
25202520

25212521
let go_statement_delimiter = "SELECT 1\nGO";
2522-
let stmts = ms().multiple_statements_parse_to(go_statement_delimiter, 2, "SELECT 1; \nGO");
2522+
let stmts = ms().statements_parse_to(go_statement_delimiter, 2, "SELECT 1; \nGO");
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\nRAISERROR('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\nRAISERROR('This is a test', 16, 1)",
@@ -2547,40 +2547,28 @@ fn parse_mssql_go_keyword() {
25472547
);
25482548

25492549
let multiple_gos = "SELECT 1;\nGO 5\nSELECT 2;\n GO";
2550-
let stmts = ms().multiple_statements_parse_to(multiple_gos, 4, "SELECT 1\nGO 5\nSELECT 2\nGO");
2550+
let stmts = ms().statements_parse_to(multiple_gos, 4, "SELECT 1\nGO 5\nSELECT 2\nGO");
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\nGO";
2555-
let stmts = ms().multiple_statements_parse_to(
2556-
single_line_comment_preceding_go,
2557-
2,
2558-
"USE some_database\nGO",
2559-
);
2555+
let stmts =
2556+
ms().statements_parse_to(single_line_comment_preceding_go, 2, "USE some_database\nGO");
25602557
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
25612558

25622559
let multi_line_comment_preceding_go = "USE some_database; /* okay */\nGO";
2563-
let stmts = ms().multiple_statements_parse_to(
2564-
multi_line_comment_preceding_go,
2565-
2,
2566-
"USE some_database\nGO",
2567-
);
2560+
let stmts =
2561+
ms().statements_parse_to(multi_line_comment_preceding_go, 2, "USE some_database\nGO");
25682562
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
25692563

25702564
let single_line_comment_following_go = "USE some_database;\nGO -- okay";
2571-
let stmts = ms().multiple_statements_parse_to(
2572-
single_line_comment_following_go,
2573-
2,
2574-
"USE some_database\nGO",
2575-
);
2565+
let stmts =
2566+
ms().statements_parse_to(single_line_comment_following_go, 2, "USE some_database\nGO");
25762567
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
25772568

25782569
let multi_line_comment_following = "USE some_database;\nGO/* okay */42";
2579-
let stmts = ms().multiple_statements_parse_to(
2580-
multi_line_comment_following,
2581-
2,
2582-
"USE some_database\nGO 42",
2583-
);
2570+
let stmts =
2571+
ms().statements_parse_to(multi_line_comment_following, 2, "USE some_database\nGO 42");
25842572
assert_eq!(stmts[1], Statement::Go(GoStatement { count: Some(42) }));
25852573

25862574
let actually_column_alias = "SELECT NULL GO";

0 commit comments

Comments
 (0)