Rename multiple_statements_parse_to -> statements_parse_to

Author: aharpervc

src/test_utils.rs

@@ -152,7 +152,7 @@ impl TestedDialects {
     /// 2. re-serializing the result of parsing `sql` produces the same
     ///    `canonical` sql string
     ///
-    /// For multiple statements, use [`multiple_statements_parse_to`].
+    /// For multiple statements, use [`statements_parse_to`].
     pub fn one_statement_parses_to(&self, sql: &str, canonical: &str) -> Statement {
         let mut statements = self.parse_sql_statements(sql).expect(sql);
         assert_eq!(statements.len(), 1);
@@ -169,7 +169,7 @@ impl TestedDialects {
     }
 
     /// The same as [`one_statement_parses_to`] but it works for a multiple statements
-    pub fn multiple_statements_parse_to(
+    pub fn statements_parse_to(
         &self,
         sql: &str,
         statement_count: usize,

tests/sqlparser_mssql.rs

@@ -1569,7 +1569,7 @@ fn test_mssql_cursor() {
         CLOSE Employee_Cursor; \
         DEALLOCATE Employee_Cursor\
     ";
-    let _ = ms().multiple_statements_parse_to(full_cursor_usage, 6, "");
+    let _ = ms().statements_parse_to(full_cursor_usage, 6, "");
 }
 
 #[test]
@@ -2858,11 +2858,11 @@ fn parse_mssql_update_with_output_into() {
 #[test]
 fn parse_mssql_go_keyword() {
     let single_go_keyword = "USE some_database;\nGO";
-    let stmts = ms().multiple_statements_parse_to(single_go_keyword, 2, "USE some_database\nGO");
+    let stmts = ms().statements_parse_to(single_go_keyword, 2, "USE some_database\nGO");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
 
     let go_with_count = "SELECT 1;\nGO 5";
-    let stmts = ms().multiple_statements_parse_to(go_with_count, 2, "SELECT 1\nGO 5");
+    let stmts = ms().statements_parse_to(go_with_count, 2, "SELECT 1\nGO 5");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: Some(5) }));
 
     // let go_statement_delimiter = "SELECT 1\nGO";
@@ -2871,15 +2871,15 @@ fn parse_mssql_go_keyword() {
     // assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
 
     let go_statement_delimiter = "SELECT 1\nGO";
-    let stmts = ms().multiple_statements_parse_to(go_statement_delimiter, 2, "SELECT 1; \nGO");
+    let stmts = ms().statements_parse_to(go_statement_delimiter, 2, "SELECT 1; \nGO");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
 
     let bare_go = "GO";
     let stmt = ms().one_statement_parses_to(bare_go, "GO");
     assert_eq!(stmt, Statement::Go(GoStatement { count: None }));
 
     let go_then_statements = "/* whitespace */ GO\nRAISERROR('This is a test', 16, 1);";
-    let stmts = ms().multiple_statements_parse_to(
+    let stmts = ms().statements_parse_to(
         go_then_statements,
         2,
         "GO\nRAISERROR('This is a test', 16, 1)",
@@ -2899,32 +2899,23 @@ fn parse_mssql_go_keyword() {
     );
 
     let multiple_gos = "SELECT 1;\nGO 5\nSELECT 2;\n  GO";
-    let stmts = ms().multiple_statements_parse_to(multiple_gos, 4, "SELECT 1\nGO 5\nSELECT 2\nGO");
+    let stmts = ms().statements_parse_to(multiple_gos, 4, "SELECT 1\nGO 5\nSELECT 2\nGO");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: Some(5) }));
     assert_eq!(stmts[3], Statement::Go(GoStatement { count: None }));
 
     let single_line_comment_preceding_go = "USE some_database; -- okay\nGO";
-    let stmts = ms().multiple_statements_parse_to(
-        single_line_comment_preceding_go,
-        2,
-        "USE some_database\nGO",
-    );
+    let stmts =
+        ms().statements_parse_to(single_line_comment_preceding_go, 2, "USE some_database\nGO");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
 
     let multi_line_comment_preceding_go = "USE some_database; /* okay */\nGO";
-    let stmts = ms().multiple_statements_parse_to(
-        multi_line_comment_preceding_go,
-        2,
-        "USE some_database\nGO",
-    );
+    let stmts =
+        ms().statements_parse_to(multi_line_comment_preceding_go, 2, "USE some_database\nGO");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
 
     let single_line_comment_following_go = "USE some_database;\nGO -- okay";
-    let stmts = ms().multiple_statements_parse_to(
-        single_line_comment_following_go,
-        2,
-        "USE some_database\nGO",
-    );
+    let stmts =
+        ms().statements_parse_to(single_line_comment_following_go, 2, "USE some_database\nGO");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: None }));
 
     // let actually_column_alias = "SELECT NULL AS GO";
@@ -2955,11 +2946,8 @@ fn parse_mssql_go_keyword() {
     // }
 
     let multi_line_comment_following = "USE some_database;\nGO/* okay */42";
-    let stmts = ms().multiple_statements_parse_to(
-        multi_line_comment_following,
-        2,
-        "USE some_database\nGO 42",
-    );
+    let stmts =
+        ms().statements_parse_to(multi_line_comment_following, 2, "USE some_database\nGO 42");
     assert_eq!(stmts[1], Statement::Go(GoStatement { count: Some(42) }));
 
     let invalid_go_position = "SELECT 1; GO";

tests/sqlparser_postgres.rs

@@ -8420,9 +8420,9 @@ fn parse_create_operator_class() {
 #[test]
 fn parse_identifiers_semicolon_handling() {
     let statement = "SHOW search_path; SELECT 1";
-    pg_and_generic().multiple_statements_parse_to(statement, 2, statement);
+    pg_and_generic().statements_parse_to(statement, 2, statement);
     let statement = "SHOW search_path; SHOW ALL; SHOW ALL";
-    pg_and_generic().multiple_statements_parse_to(statement, 3, statement);
+    pg_and_generic().statements_parse_to(statement, 3, statement);
 }
 
 #[test]