update base on comment

Author: kysshsy

src/ast/mod.rs

@@ -3233,7 +3233,7 @@ impl fmt::Display for Statement {
                 }
 
                 if let Some(options) = options {
-                    write!(f, "({}) ",display_comma_separated(options))?;
+                    write!(f, "({}) ", display_comma_separated(options))?;
                 }
 
                 write!(f, "{statement}")

src/parser/mod.rs

@@ -1274,7 +1274,7 @@ impl<'a> Parser<'a> {
         }
     }
 
-    pub fn parse_utility_option_list(&mut self) -> Result<Vec<UtilityOption>, ParserError> {
+    pub fn parse_utility_options(&mut self) -> Result<Vec<UtilityOption>, ParserError> {
         self.expect_token(&Token::LParen)?;
         let options = self.parse_comma_separated(Self::parse_utility_option)?;
         self.expect_token(&Token::RParen)?;
@@ -8471,10 +8471,10 @@ impl<'a> Parser<'a> {
         // Note: DuckDB is compatible with PostgreSQL syntax for this statement,
         // although not all features may be implemented.
         if describe_alias == DescribeAlias::Explain
-            && dialect_of!(self is PostgreSqlDialect | DuckDbDialect | GenericDialect)
+            && self.dialect.supports_explain_with_utility_options()
             && self.peek_token().token == Token::LParen
         {
-            options = Some(self.parse_utility_option_list()?)
+            options = Some(self.parse_utility_options()?)
         } else {
             analyze = self.parse_keyword(Keyword::ANALYZE);
             verbose = self.parse_keyword(Keyword::VERBOSE);

src/test_utils.rs

@@ -148,12 +148,6 @@ impl TestedDialects {
         self.one_statement_parses_to(sql, sql)
     }
 
-    /// Ensures that `sql` parses as a single [Statement] and that the re-serialization of the parsed
-    /// result matches the given `canonical` SQL string.
-    pub fn verified_stmt_with_canonical(&self, sql: &str, canonical: &str) -> Statement {
-        self.one_statement_parses_to(sql, canonical)
-    }
-
     /// Ensures that `sql` parses as a single [Query], and that
     /// re-serializing the parse result produces the same `sql`
     /// string (is not modified after a serialization round-trip).

tests/sqlparser_common.rs

@@ -4256,31 +4256,14 @@ fn parse_scalar_function_in_projection() {
 }
 
 fn run_explain_analyze(
+    dialect: TestedDialects,
     query: &str,
     expected_verbose: bool,
     expected_analyze: bool,
     expected_format: Option<AnalyzeFormat>,
     exepcted_options: Option<Vec<UtilityOption>>,
 ) {
-    run_explain_analyze_with_specific_dialect(
-        |_d| true,
-        query,
-        expected_verbose,
-        expected_analyze,
-        expected_format,
-        exepcted_options,
-    )
-}
-
-fn run_explain_analyze_with_specific_dialect<T: Fn(&dyn Dialect) -> bool>(
-    dialect_predicate: T,
-    query: &str,
-    expected_verbose: bool,
-    expected_analyze: bool,
-    expected_format: Option<AnalyzeFormat>,
-    exepcted_options: Option<Vec<UtilityOption>>,
-) {
-    match all_dialects_where(dialect_predicate).verified_stmt(query) {
+    match dialect.verified_stmt(query) {
         Statement::Explain {
             describe_alias: _,
             analyze,
@@ -4338,29 +4321,40 @@ fn explain_desc() {
 fn parse_explain_analyze_with_simple_select() {
     // Describe is an alias for EXPLAIN
     run_explain_analyze(
+        all_dialects(),
         "DESCRIBE SELECT sqrt(id) FROM foo",
         false,
         false,
         None,
         None,
     );
 
-    run_explain_analyze("EXPLAIN SELECT sqrt(id) FROM foo", false, false, None, None);
     run_explain_analyze(
+        all_dialects(),
+        "EXPLAIN SELECT sqrt(id) FROM foo",
+        false,
+        false,
+        None,
+        None,
+    );
+    run_explain_analyze(
+        all_dialects(),
         "EXPLAIN VERBOSE SELECT sqrt(id) FROM foo",
         true,
         false,
         None,
         None,
     );
     run_explain_analyze(
+        all_dialects(),
         "EXPLAIN ANALYZE SELECT sqrt(id) FROM foo",
         false,
         true,
         None,
         None,
     );
     run_explain_analyze(
+        all_dialects(),
         "EXPLAIN ANALYZE VERBOSE SELECT sqrt(id) FROM foo",
         true,
         true,
@@ -4369,6 +4363,7 @@ fn parse_explain_analyze_with_simple_select() {
     );
 
     run_explain_analyze(
+        all_dialects(),
         "EXPLAIN ANALYZE FORMAT GRAPHVIZ SELECT sqrt(id) FROM foo",
         false,
         true,
@@ -4377,6 +4372,7 @@ fn parse_explain_analyze_with_simple_select() {
     );
 
     run_explain_analyze(
+        all_dialects(),
         "EXPLAIN ANALYZE VERBOSE FORMAT JSON SELECT sqrt(id) FROM foo",
         true,
         true,
@@ -4385,6 +4381,7 @@ fn parse_explain_analyze_with_simple_select() {
     );
 
     run_explain_analyze(
+        all_dialects(),
         "EXPLAIN VERBOSE FORMAT TEXT SELECT sqrt(id) FROM foo",
         true,
         false,
@@ -10828,8 +10825,8 @@ fn test_extract_seconds_single_quote_err() {
 
 #[test]
 fn parse_explain_with_option_list() {
-    run_explain_analyze_with_specific_dialect(
-        |d| d.supports_explain_with_utility_options(),
+    run_explain_analyze(
+        all_dialects_where(|d| d.supports_explain_with_utility_options()),
         "EXPLAIN (ANALYZE false, VERBOSE true) SELECT sqrt(id) FROM foo",
         false,
         false,
@@ -10846,8 +10843,8 @@ fn parse_explain_with_option_list() {
         ]),
     );
 
-    run_explain_analyze_with_specific_dialect(
-        |d| d.supports_explain_with_utility_options(),
+    run_explain_analyze(
+        all_dialects_where(|d| d.supports_explain_with_utility_options()),
         "EXPLAIN (ANALYZE ON, VERBOSE OFF) SELECT sqrt(id) FROM foo",
         false,
         false,
@@ -10864,8 +10861,8 @@ fn parse_explain_with_option_list() {
         ]),
     );
 
-    run_explain_analyze_with_specific_dialect(
-        |d| d.supports_explain_with_utility_options(),
+    run_explain_analyze(
+        all_dialects_where(|d| d.supports_explain_with_utility_options()),
         r#"EXPLAIN (FORMAT1 TEXT, FORMAT2 'JSON', FORMAT3 "XML", FORMAT4 YAML) SELECT sqrt(id) FROM foo"#,
         false,
         false,
@@ -10890,8 +10887,8 @@ fn parse_explain_with_option_list() {
         ]),
     );
 
-    run_explain_analyze_with_specific_dialect(
-        |d| d.supports_explain_with_utility_options(),
+    run_explain_analyze(
+        all_dialects_where(|d| d.supports_explain_with_utility_options()),
         r#"EXPLAIN (NUM1 10, NUM2 +10.1, NUM3 -10.2) SELECT sqrt(id) FROM foo"#,
         false,
         false,
@@ -10918,7 +10915,7 @@ fn parse_explain_with_option_list() {
         ]),
     );
 
-    let utility_option_list = vec![
+    let utility_options = vec![
         UtilityOption {
             name: Ident::new("ANALYZE"),
             arg: None,
@@ -10943,12 +10940,12 @@ fn parse_explain_with_option_list() {
             }),
         },
     ];
-    run_explain_analyze_with_specific_dialect(
-        |d| d.supports_explain_with_utility_options(),
+    run_explain_analyze (
+        all_dialects_where(|d| d.supports_explain_with_utility_options()),
         "EXPLAIN (ANALYZE, VERBOSE true, WAL OFF, FORMAT YAML, USER_DEF_NUM -100.1) SELECT sqrt(id) FROM foo",
         false,
         false,
         None,
-        Some(utility_option_list),
+        Some(utility_options),
     );
 }