Merge branch 'main' into pretty-print-create-table

Author: lovasoa

sqlparser_bench/Cargo.toml

@@ -26,7 +26,7 @@ edition = "2018"
 sqlparser = { path = "../" }
 
 [dev-dependencies]
-criterion = "0.5"
+criterion = "0.6"
 
 [[bench]]
 name = "sqlparser_bench"

sqlparser_bench/benches/sqlparser_bench.rs

@@ -68,7 +68,7 @@ fn basic_queries(c: &mut Criterion) {
     };
 
     group.bench_function("parse_large_statement", |b| {
-        b.iter(|| Parser::parse_sql(&dialect, criterion::black_box(large_statement.as_str())));
+        b.iter(|| Parser::parse_sql(&dialect, std::hint::black_box(large_statement.as_str())));
     });
 
     let large_statement = Parser::parse_sql(&dialect, large_statement.as_str())

src/ast/visitor.rs

@@ -741,15 +741,16 @@ mod tests {
         }
     }
 
-    fn do_visit<V: Visitor>(sql: &str, visitor: &mut V) -> Statement {
+    fn do_visit<V: Visitor<Break = ()>>(sql: &str, visitor: &mut V) -> Statement {
         let dialect = GenericDialect {};
         let tokens = Tokenizer::new(&dialect, sql).tokenize().unwrap();
         let s = Parser::new(&dialect)
             .with_tokens(tokens)
             .parse_statement()
             .unwrap();
 
-        s.visit(visitor);
+        let flow = s.visit(visitor);
+        assert_eq!(flow, ControlFlow::Continue(()));
         s
     }
 
@@ -938,7 +939,8 @@ mod tests {
             .unwrap();
 
         let mut visitor = QuickVisitor {};
-        s.visit(&mut visitor);
+        let flow = s.visit(&mut visitor);
+        assert_eq!(flow, ControlFlow::Continue(()));
     }
 }
 
@@ -969,15 +971,16 @@ mod visit_mut_tests {
         }
     }
 
-    fn do_visit_mut<V: VisitorMut>(sql: &str, visitor: &mut V) -> Statement {
+    fn do_visit_mut<V: VisitorMut<Break = ()>>(sql: &str, visitor: &mut V) -> Statement {
         let dialect = GenericDialect {};
         let tokens = Tokenizer::new(&dialect, sql).tokenize().unwrap();
         let mut s = Parser::new(&dialect)
             .with_tokens(tokens)
             .parse_statement()
             .unwrap();
 
-        s.visit(visitor);
+        let flow = s.visit(visitor);
+        assert_eq!(flow, ControlFlow::Continue(()));
         s
     }
 

src/lib.rs

@@ -149,6 +149,10 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![allow(clippy::upper_case_acronyms)]
+// Permit large enum variants to keep a unified, expressive AST.
+// Splitting complex nodes (expressions, statements, types) into separate types
+// would bloat the API and hide intent. Extra memory is a worthwhile tradeoff.
+#![allow(clippy::large_enum_variant)]
 
 // Allow proc-macros to find this crate
 extern crate self as sqlparser;

src/parser/mod.rs

@@ -2558,10 +2558,7 @@ impl<'a> Parser<'a> {
         self.expect_token(&Token::LParen)?;
         let mut trim_where = None;
         if let Token::Word(word) = self.peek_token().token {
-            if [Keyword::BOTH, Keyword::LEADING, Keyword::TRAILING]
-                .iter()
-                .any(|d| word.keyword == *d)
-            {
+            if [Keyword::BOTH, Keyword::LEADING, Keyword::TRAILING].contains(&word.keyword) {
                 trim_where = Some(self.parse_trim_where()?);
             }
         }

tests/sqlparser_common.rs

@@ -14346,7 +14346,7 @@ fn test_visit_order() {
     let sql = "SELECT CASE a WHEN 1 THEN 2 WHEN 3 THEN 4 ELSE 5 END";
     let stmt = verified_stmt(sql);
     let mut visited = vec![];
-    sqlparser::ast::visit_expressions(&stmt, |expr| {
+    let _ = sqlparser::ast::visit_expressions(&stmt, |expr| {
         visited.push(expr.to_string());
         core::ops::ControlFlow::<()>::Continue(())
     });