Skip to content

Commit 56c1a4a

Browse files
committed
Rename multiple_statements_parse_to -> statements_parse_to
1 parent b8a184c commit 56c1a4a

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

src/test_utils.rs

+2-2
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

+13-25
Original file line numberDiff line numberDiff line change
@@ -2075,23 +2075,23 @@ fn parse_print() {
20752075
#[test]
20762076
fn parse_mssql_go_keyword() {
20772077
let single_go_keyword = "USE some_database;\nGO";
2078-
let stmts = ms().multiple_statements_parse_to(single_go_keyword, 2, "USE some_database\nGO");
2078+
let stmts = ms().statements_parse_to(single_go_keyword, 2, "USE some_database\nGO");
20792079
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
20802080

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

20852085
let go_statement_delimiter = "SELECT 1\nGO";
2086-
let stmts = ms().multiple_statements_parse_to(go_statement_delimiter, 2, "SELECT 1; \nGO");
2086+
let stmts = ms().statements_parse_to(go_statement_delimiter, 2, "SELECT 1; \nGO");
20872087
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
20882088

20892089
let bare_go = "GO";
20902090
let stmt = ms().one_statement_parses_to(bare_go, "GO");
20912091
assert_eq!(stmt, Statement::Go(GoStatement { count: None }));
20922092

20932093
let go_then_statements = "/* whitespace */ GO\nRAISERROR('This is a test', 16, 1);";
2094-
let stmts = ms().multiple_statements_parse_to(
2094+
let stmts = ms().statements_parse_to(
20952095
go_then_statements,
20962096
2,
20972097
"GO\nRAISERROR('This is a test', 16, 1)",
@@ -2111,40 +2111,28 @@ fn parse_mssql_go_keyword() {
21112111
);
21122112

21132113
let multiple_gos = "SELECT 1;\nGO 5\nSELECT 2;\n GO";
2114-
let stmts = ms().multiple_statements_parse_to(multiple_gos, 4, "SELECT 1\nGO 5\nSELECT 2\nGO");
2114+
let stmts = ms().statements_parse_to(multiple_gos, 4, "SELECT 1\nGO 5\nSELECT 2\nGO");
21152115
assert_eq!(stmts[1], Statement::Go(GoStatement { count: Some(5) }));
21162116
assert_eq!(stmts[3], Statement::Go(GoStatement { count: None }));
21172117

21182118
let single_line_comment_preceding_go = "USE some_database; -- okay\nGO";
2119-
let stmts = ms().multiple_statements_parse_to(
2120-
single_line_comment_preceding_go,
2121-
2,
2122-
"USE some_database\nGO",
2123-
);
2119+
let stmts =
2120+
ms().statements_parse_to(single_line_comment_preceding_go, 2, "USE some_database\nGO");
21242121
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
21252122

21262123
let multi_line_comment_preceding_go = "USE some_database; /* okay */\nGO";
2127-
let stmts = ms().multiple_statements_parse_to(
2128-
multi_line_comment_preceding_go,
2129-
2,
2130-
"USE some_database\nGO",
2131-
);
2124+
let stmts =
2125+
ms().statements_parse_to(multi_line_comment_preceding_go, 2, "USE some_database\nGO");
21322126
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
21332127

21342128
let single_line_comment_following_go = "USE some_database;\nGO -- okay";
2135-
let stmts = ms().multiple_statements_parse_to(
2136-
single_line_comment_following_go,
2137-
2,
2138-
"USE some_database\nGO",
2139-
);
2129+
let stmts =
2130+
ms().statements_parse_to(single_line_comment_following_go, 2, "USE some_database\nGO");
21402131
assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
21412132

21422133
let multi_line_comment_following = "USE some_database;\nGO/* okay */42";
2143-
let stmts = ms().multiple_statements_parse_to(
2144-
multi_line_comment_following,
2145-
2,
2146-
"USE some_database\nGO 42",
2147-
);
2134+
let stmts =
2135+
ms().statements_parse_to(multi_line_comment_following, 2, "USE some_database\nGO 42");
21482136
assert_eq!(stmts[1], Statement::Go(GoStatement { count: Some(42) }));
21492137

21502138
let actually_column_alias = "SELECT NULL GO";

0 commit comments

Comments
 (0)