From 505d7bd00f4547c69055718c398deeb88ad0fb38 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Sun, 4 Sep 2022 19:52:26 +0200
Subject: [PATCH 01/13] Add an AST visitor

This adds an optional "derive-visitor" feature which lets the user visit and mutate the AST easily
---
 Cargo.toml                 |   3 +-
 src/ast/data_type.rs       |  46 +++---
 src/ast/ddl.rs             |  29 ++--
 src/ast/mod.rs             | 314 +++++++++++++++++++++----------------
 src/ast/operator.rs        |   7 +-
 src/ast/query.rs           |  55 +++++--
 src/ast/value.rs           |  28 ++--
 src/keywords.rs            |   5 +
 src/tokenizer.rs           |  79 +++++-----
 tests/sqlparser_visitor.rs |  20 +++
 10 files changed, 358 insertions(+), 228 deletions(-)
 create mode 100644 tests/sqlparser_visitor.rs

diff --git a/Cargo.toml b/Cargo.toml
index 02ac9a53f..debfdf028 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.22.0"
 authors = ["Andy Grove <andygrove73@gmail.com>"]
 homepage = "https://github.com/sqlparser-rs/sqlparser-rs"
 documentation = "https://docs.rs/sqlparser/"
-keywords = [ "ansi", "sql", "lexer", "parser" ]
+keywords = ["ansi", "sql", "lexer", "parser"]
 repository = "https://github.com/sqlparser-rs/sqlparser-rs"
 license = "Apache-2.0"
 include = [
@@ -32,6 +32,7 @@ serde = { version = "1.0", features = ["derive"], optional = true }
 # of dev-dependencies because of
 # https://github.com/rust-lang/cargo/issues/1596
 serde_json = { version = "1.0", optional = true }
+derive-visitor = { version = "0.3.0", git = "https://github.com/lovasoa/derive-visitor.git", branch = "issue8-implement-mutable-visit", optional = true }
 
 [dev-dependencies]
 simple_logger = "2.1"
diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
index 3a6ebf4cd..a6d7e6909 100644
--- a/src/ast/data_type.rs
+++ b/src/ast/data_type.rs
@@ -17,6 +17,9 @@ use core::fmt;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 use crate::ast::ObjectName;
 
 use super::value::escape_single_quote_string;
@@ -24,47 +27,48 @@ use super::value::escape_single_quote_string;
 /// SQL data types
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum DataType {
     /// Fixed-length character type e.g. CHAR(10)
-    Char(Option<u64>),
+    Char(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Variable-length character type e.g. VARCHAR(10)
-    Varchar(Option<u64>),
+    Varchar(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Variable-length character type e.g. NVARCHAR(10)
-    Nvarchar(Option<u64>),
+    Nvarchar(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Uuid type
     Uuid,
     /// Large character object e.g. CLOB(1000)
-    Clob(u64),
+    Clob(#[cfg_attr(feature = "derive-visitor", drive(skip))] u64),
     /// Fixed-length binary type e.g. BINARY(10)
-    Binary(u64),
+    Binary(#[cfg_attr(feature = "derive-visitor", drive(skip))] u64),
     /// Variable-length binary type e.g. VARBINARY(10)
-    Varbinary(u64),
+    Varbinary(#[cfg_attr(feature = "derive-visitor", drive(skip))] u64),
     /// Large binary object e.g. BLOB(1000)
-    Blob(u64),
+    Blob(#[cfg_attr(feature = "derive-visitor", drive(skip))] u64),
     /// Decimal type with optional precision and scale e.g. DECIMAL(10,2)
-    Decimal(Option<u64>, Option<u64>),
+    Decimal(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>, #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Floating point with optional precision e.g. FLOAT(8)
-    Float(Option<u64>),
+    Float(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Tiny integer with optional display width e.g. TINYINT or TINYINT(3)
-    TinyInt(Option<u64>),
+    TinyInt(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Unsigned tiny integer with optional display width e.g. TINYINT UNSIGNED or TINYINT(3) UNSIGNED
-    UnsignedTinyInt(Option<u64>),
+    UnsignedTinyInt(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Small integer with optional display width e.g. SMALLINT or SMALLINT(5)
-    SmallInt(Option<u64>),
+    SmallInt(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Unsigned small integer with optional display width e.g. SMALLINT UNSIGNED or SMALLINT(5) UNSIGNED
-    UnsignedSmallInt(Option<u64>),
+    UnsignedSmallInt(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Integer with optional display width e.g. INT or INT(11)
-    Int(Option<u64>),
+    Int(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Integer with optional display width e.g. INTEGER or INTEGER(11)
-    Integer(Option<u64>),
+    Integer(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Unsigned integer with optional display width e.g. INT UNSIGNED or INT(11) UNSIGNED
-    UnsignedInt(Option<u64>),
+    UnsignedInt(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Unsigned integer with optional display width e.g. INTGER UNSIGNED or INTEGER(11) UNSIGNED
-    UnsignedInteger(Option<u64>),
+    UnsignedInteger(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Big integer with optional display width e.g. BIGINT or BIGINT(20)
-    BigInt(Option<u64>),
+    BigInt(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Unsigned big integer with optional display width e.g. BIGINT UNSIGNED or BIGINT(20) UNSIGNED
-    UnsignedBigInt(Option<u64>),
+    UnsignedBigInt(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Floating point e.g. REAL
     Real,
     /// Double e.g. DOUBLE PRECISION
@@ -96,9 +100,9 @@ pub enum DataType {
     /// Arrays
     Array(Box<DataType>),
     /// Enums
-    Enum(Vec<String>),
+    Enum(#[cfg_attr(feature = "derive-visitor", drive(skip))] Vec<String>),
     /// Set
-    Set(Vec<String>),
+    Set(#[cfg_attr(feature = "derive-visitor", drive(skip))] Vec<String>),
 }
 
 impl fmt::Display for DataType {
diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
index 1847f2518..62ae582b5 100644
--- a/src/ast/ddl.rs
+++ b/src/ast/ddl.rs
@@ -20,6 +20,9 @@ use core::fmt;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 use crate::ast::value::escape_single_quote_string;
 use crate::ast::{display_comma_separated, display_separated, DataType, Expr, Ident, ObjectName};
 use crate::tokenizer::Token;
@@ -27,6 +30,7 @@ use crate::tokenizer::Token;
 /// An `ALTER TABLE` (`Statement::AlterTable`) operation
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum AlterTableOperation {
     /// `ADD <table_constraint>`
     AddConstraint(TableConstraint),
@@ -34,15 +38,15 @@ pub enum AlterTableOperation {
     AddColumn { column_def: ColumnDef },
     /// `DROP CONSTRAINT [ IF EXISTS ] <name>`
     DropConstraint {
-        if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
         name: Ident,
-        cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
     },
     /// `DROP [ COLUMN ] [ IF EXISTS ] <column_name> [ CASCADE ]`
     DropColumn {
         column_name: Ident,
-        if_exists: bool,
-        cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
     },
     /// `RENAME TO PARTITION (partition=val)`
     RenamePartitions {
@@ -51,12 +55,12 @@ pub enum AlterTableOperation {
     },
     /// Add Partitions
     AddPartitions {
-        if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
         new_partitions: Vec<Expr>,
     },
     DropPartitions {
         partitions: Vec<Expr>,
-        if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
     },
     /// `RENAME [ COLUMN ] <old_column_name> TO <new_column_name>`
     RenameColumn {
@@ -178,6 +182,7 @@ impl fmt::Display for AlterTableOperation {
 /// An `ALTER COLUMN` (`Statement::AlterTable`) operation
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum AlterColumnOperation {
     /// `SET NOT NULL`
     SetNotNull,
@@ -221,13 +226,14 @@ impl fmt::Display for AlterColumnOperation {
 /// `ALTER TABLE ADD <constraint>` statement.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum TableConstraint {
     /// `[ CONSTRAINT <name> ] { PRIMARY KEY | UNIQUE } (<columns>)`
     Unique {
         name: Option<Ident>,
         columns: Vec<Ident>,
         /// Whether this is a `PRIMARY KEY` or just a `UNIQUE` constraint
-        is_primary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] is_primary: bool,
     },
     /// A referential integrity constraint (`[ CONSTRAINT <name> ] FOREIGN KEY (<columns>)
     /// REFERENCES <foreign_table> (<referred_columns>)
@@ -297,6 +303,7 @@ impl fmt::Display for TableConstraint {
 /// SQL column definition
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct ColumnDef {
     pub name: Ident,
     pub data_type: DataType,
@@ -332,6 +339,7 @@ impl fmt::Display for ColumnDef {
 /// "column options," and we allow any column option to be named.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct ColumnOptionDef {
     pub name: Option<Ident>,
     pub option: ColumnOption,
@@ -347,6 +355,7 @@ impl fmt::Display for ColumnOptionDef {
 /// TABLE` statement.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ColumnOption {
     /// `NULL`
     Null,
@@ -356,7 +365,7 @@ pub enum ColumnOption {
     Default(Expr),
     /// `{ PRIMARY KEY | UNIQUE }`
     Unique {
-        is_primary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] is_primary: bool,
     },
     /// A referential integrity constraint (`[FOREIGN KEY REFERENCES
     /// <foreign_table> (<referred_columns>)
@@ -376,7 +385,7 @@ pub enum ColumnOption {
     /// - ...
     DialectSpecific(Vec<Token>),
     CharacterSet(ObjectName),
-    Comment(String),
+    Comment(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
 }
 
 impl fmt::Display for ColumnOption {
@@ -433,7 +442,7 @@ fn display_constraint_name(name: &'_ Option<Ident>) -> impl fmt::Display + '_ {
 ///
 /// Used in foreign key constraints in `ON UPDATE` and `ON DELETE` options.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ReferentialAction {
     Restrict,
     Cascade,
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index 4f5fdb2eb..9768aecae 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -28,6 +28,9 @@ use core::fmt;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 pub use self::data_type::DataType;
 pub use self::ddl::{
     AlterColumnOperation, AlterTableOperation, ColumnDef, ColumnOption, ColumnOptionDef,
@@ -42,16 +45,16 @@ pub use self::query::{
 pub use self::value::{DateTimeField, TrimWhereField, Value};
 
 struct DisplaySeparated<'a, T>
-where
-    T: fmt::Display,
+    where
+        T: fmt::Display,
 {
     slice: &'a [T],
     sep: &'static str,
 }
 
 impl<'a, T> fmt::Display for DisplaySeparated<'a, T>
-where
-    T: fmt::Display,
+    where
+        T: fmt::Display,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut delim = "";
@@ -65,35 +68,35 @@ where
 }
 
 fn display_separated<'a, T>(slice: &'a [T], sep: &'static str) -> DisplaySeparated<'a, T>
-where
-    T: fmt::Display,
+    where
+        T: fmt::Display,
 {
     DisplaySeparated { slice, sep }
 }
 
 fn display_comma_separated<T>(slice: &[T]) -> DisplaySeparated<'_, T>
-where
-    T: fmt::Display,
+    where
+        T: fmt::Display,
 {
     DisplaySeparated { slice, sep: ", " }
 }
 
 /// An identifier, decomposed into its value or character data and the quote style.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Ident {
     /// The value of the identifier without quotes.
-    pub value: String,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub value: String,
     /// The starting quote if any. Valid quote characters are the single quote,
     /// double quote, backtick, and opening square bracket.
-    pub quote_style: Option<char>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub quote_style: Option<char>,
 }
 
 impl Ident {
     /// Create a new identifier with the given value and no quotes.
     pub fn new<S>(value: S) -> Self
-    where
-        S: Into<String>,
+        where
+            S: Into<String>,
     {
         Ident {
             value: value.into(),
@@ -104,8 +107,8 @@ impl Ident {
     /// Create a new quoted identifier with the given quote and value. This function
     /// panics if the given quote is not a valid quote character.
     pub fn with_quote<S>(quote: char, value: S) -> Self
-    where
-        S: Into<String>,
+        where
+            S: Into<String>,
     {
         assert!(quote == '\'' || quote == '"' || quote == '`' || quote == '[');
         Ident {
@@ -141,6 +144,7 @@ impl fmt::Display for Ident {
 /// A name of a table, view, custom type, etc., possibly multi-part, i.e. db.schema.obj
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct ObjectName(pub Vec<Ident>);
 
 impl fmt::Display for ObjectName {
@@ -151,6 +155,7 @@ impl fmt::Display for ObjectName {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 /// Represents an Array Expression, either
 /// `ARRAY[..]`, or `[..]`
 pub struct Array {
@@ -158,7 +163,7 @@ pub struct Array {
     pub elem: Vec<Expr>,
 
     /// `true` for  `ARRAY[..]`, `false` for `[..]`
-    pub named: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub named: bool,
 }
 
 impl fmt::Display for Array {
@@ -175,6 +180,7 @@ impl fmt::Display for Array {
 /// JsonOperator
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum JsonOperator {
     /// -> keeps the value as json
     Arrow,
@@ -212,6 +218,7 @@ impl fmt::Display for JsonOperator {
 /// inappropriate type, like `WHERE 1` or `SELECT 1=1`, as necessary.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum Expr {
     /// Identifier e.g. table name or column name
     Identifier(Ident),
@@ -249,24 +256,24 @@ pub enum Expr {
     InList {
         expr: Box<Expr>,
         list: Vec<Expr>,
-        negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
     },
     /// `[ NOT ] IN (SELECT ...)`
     InSubquery {
         expr: Box<Expr>,
         subquery: Box<Query>,
-        negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
     },
     /// `[ NOT ] IN UNNEST(array_expression)`
     InUnnest {
         expr: Box<Expr>,
         array_expr: Box<Expr>,
-        negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
     },
     /// `<expr> [ NOT ] BETWEEN <low> AND <high>`
     Between {
         expr: Box<Expr>,
-        negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
         low: Box<Expr>,
         high: Box<Expr>,
     },
@@ -278,24 +285,24 @@ pub enum Expr {
     },
     /// LIKE
     Like {
-        negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
         expr: Box<Expr>,
         pattern: Box<Expr>,
-        escape_char: Option<char>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] escape_char: Option<char>,
     },
     /// ILIKE (case-insensitive LIKE)
     ILike {
-        negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
         expr: Box<Expr>,
         pattern: Box<Expr>,
-        escape_char: Option<char>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] escape_char: Option<char>,
     },
     /// SIMILAR TO regex
     SimilarTo {
-        negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
         expr: Box<Expr>,
         pattern: Box<Expr>,
-        escape_char: Option<char>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] escape_char: Option<char>,
     },
     /// Any operation e.g. `1 ANY (1)` or `foo > ANY(bar)`, It will be wrapped in the right side of BinaryExpr
     AnyOp(Box<Expr>),
@@ -324,7 +331,7 @@ pub enum Expr {
     /// AT a timestamp to a different timezone e.g. `FROM_UNIXTIME(0) AT TIME ZONE 'UTC-06:00'`
     AtTimeZone {
         timestamp: Box<Expr>,
-        time_zone: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] time_zone: String,
     },
     /// EXTRACT(DateTimeField FROM <expr>)
     Extract {
@@ -367,7 +374,7 @@ pub enum Expr {
     /// A constant of form `<data_type> 'value'`.
     /// This can represent ANSI SQL `DATE`, `TIME`, and `TIMESTAMP` literals (such as `DATE '2020-01-01'`),
     /// as well as constants of other types (a non-standard PostgreSQL extension).
-    TypedString { data_type: DataType, value: String },
+    TypedString { data_type: DataType, #[cfg_attr(feature = "derive-visitor", drive(skip))] value: String },
     /// Access a map-like object by field (e.g. `column['field']` or `column[4]`
     /// Note that depending on the dialect, struct like accesses may be
     /// parsed as [`ArrayIndex`] or [`MapAccess`]
@@ -388,7 +395,7 @@ pub enum Expr {
     },
     /// An exists expression `[ NOT ] EXISTS(SELECT ...)`, used in expressions like
     /// `WHERE [ NOT ] EXISTS (SELECT ...)`.
-    Exists { subquery: Box<Query>, negated: bool },
+    Exists { subquery: Box<Query>, #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool },
     /// A parenthesized subquery `(SELECT ...)`, used in expression like
     /// `SELECT (subquery) AS x` or `WHERE (subquery) = x`
     Subquery(Box<Query>),
@@ -724,6 +731,7 @@ impl fmt::Display for Expr {
 /// A window specification (i.e. `OVER (PARTITION BY .. ORDER BY .. etc.)`)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct WindowSpec {
     pub partition_by: Vec<Expr>,
     pub order_by: Vec<OrderByExpr>,
@@ -769,6 +777,7 @@ impl fmt::Display for WindowSpec {
 /// reject invalid bounds like `ROWS UNBOUNDED FOLLOWING` before execution.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct WindowFrame {
     pub units: WindowFrameUnits,
     pub start_bound: WindowFrameBound,
@@ -794,6 +803,7 @@ impl Default for WindowFrame {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum WindowFrameUnits {
     Rows,
     Range,
@@ -813,13 +823,14 @@ impl fmt::Display for WindowFrameUnits {
 /// Specifies [WindowFrame]'s `start_bound` and `end_bound`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum WindowFrameBound {
     /// `CURRENT ROW`
     CurrentRow,
     /// `<N> PRECEDING` or `UNBOUNDED PRECEDING`
-    Preceding(Option<u64>),
+    Preceding(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// `<N> FOLLOWING` or `UNBOUNDED FOLLOWING`.
-    Following(Option<u64>),
+    Following(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
 }
 
 impl fmt::Display for WindowFrameBound {
@@ -836,6 +847,7 @@ impl fmt::Display for WindowFrameBound {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum AddDropSync {
     ADD,
     DROP,
@@ -854,6 +866,7 @@ impl fmt::Display for AddDropSync {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ShowCreateObject {
     Event,
     Function,
@@ -878,6 +891,7 @@ impl fmt::Display for ShowCreateObject {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CommentObject {
     Column,
     Table,
@@ -896,16 +910,17 @@ impl fmt::Display for CommentObject {
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum Statement {
     /// Analyze (Hive)
     Analyze {
         table_name: ObjectName,
         partitions: Option<Vec<Expr>>,
-        for_columns: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] for_columns: bool,
         columns: Vec<Ident>,
-        cache_metadata: bool,
-        noscan: bool,
-        compute_statistics: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] cache_metadata: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] noscan: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] compute_statistics: bool,
     },
     /// Truncate (Hive)
     Truncate {
@@ -915,7 +930,7 @@ pub enum Statement {
     /// Msck (Hive)
     Msck {
         table_name: ObjectName,
-        repair: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] repair: bool,
         partition_action: Option<AddDropSync>,
     },
     /// SELECT
@@ -925,13 +940,13 @@ pub enum Statement {
         /// Only for Sqlite
         or: Option<SqliteOnConflict>,
         /// INTO - optional keyword
-        into: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] into: bool,
         /// TABLE
         table_name: ObjectName,
         /// COLUMNS
         columns: Vec<Ident>,
         /// Overwrite (Hive)
-        overwrite: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] overwrite: bool,
         /// A SQL query that specifies what to insert
         source: Box<Query>,
         /// partitioned insert (Hive)
@@ -939,14 +954,14 @@ pub enum Statement {
         /// Columns defined after PARTITION
         after_columns: Vec<Ident>,
         /// whether the insert has the table keyword (Hive)
-        table: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] table: bool,
         on: Option<OnInsert>,
     },
     // TODO: Support ROW FORMAT
     Directory {
-        overwrite: bool,
-        local: bool,
-        path: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] overwrite: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] local: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] path: String,
         file_format: Option<FileFormat>,
         source: Box<Query>,
     },
@@ -956,7 +971,7 @@ pub enum Statement {
         /// COLUMNS
         columns: Vec<Ident>,
         /// If true, is a 'COPY TO' statement. If false is a 'COPY FROM'
-        to: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] to: bool,
         /// The source of 'COPY FROM', or the target of 'COPY TO'
         target: CopyTarget,
         /// WITH options (from PostgreSQL version 9.0)
@@ -964,7 +979,7 @@ pub enum Statement {
         /// WITH options (before PostgreSQL version 9.0)
         legacy_options: Vec<CopyLegacyOption>,
         /// VALUES a vector of values to be copied
-        values: Vec<Option<String>>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] values: Vec<Option<String>>,
     },
     /// Close - closes the portal underlying an open cursor.
     Close {
@@ -993,8 +1008,8 @@ pub enum Statement {
     },
     /// CREATE VIEW
     CreateView {
-        or_replace: bool,
-        materialized: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] or_replace: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] materialized: bool,
         /// View name
         name: ObjectName,
         columns: Vec<Ident>,
@@ -1003,11 +1018,11 @@ pub enum Statement {
     },
     /// CREATE TABLE
     CreateTable {
-        or_replace: bool,
-        temporary: bool,
-        external: bool,
-        global: Option<bool>,
-        if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] or_replace: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] temporary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] external: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] global: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
         /// Table name
         name: ObjectName,
         /// Optional schema
@@ -1018,23 +1033,23 @@ pub enum Statement {
         table_properties: Vec<SqlOption>,
         with_options: Vec<SqlOption>,
         file_format: Option<FileFormat>,
-        location: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] location: Option<String>,
         query: Option<Box<Query>>,
-        without_rowid: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] without_rowid: bool,
         like: Option<ObjectName>,
         clone: Option<ObjectName>,
-        engine: Option<String>,
-        default_charset: Option<String>,
-        collation: Option<String>,
-        on_commit: Option<OnCommit>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] engine: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] default_charset: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] collation: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] on_commit: Option<OnCommit>,
         /// Click house "ON CLUSTER" clause:
         /// <https://clickhouse.com/docs/en/sql-reference/distributed-ddl/>
-        on_cluster: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] on_cluster: Option<String>,
     },
     /// SQLite's `CREATE VIRTUAL TABLE .. USING <module_name> (<module_args>)`
     CreateVirtualTable {
         name: ObjectName,
-        if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
         module_name: Ident,
         module_args: Vec<Ident>,
     },
@@ -1044,8 +1059,8 @@ pub enum Statement {
         name: ObjectName,
         table_name: ObjectName,
         columns: Vec<OrderByExpr>,
-        unique: bool,
-        if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] unique: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
     },
     /// ALTER TABLE
     AlterTable {
@@ -1058,15 +1073,15 @@ pub enum Statement {
         /// The type of the object to drop: TABLE, VIEW, etc.
         object_type: ObjectType,
         /// An optional `IF EXISTS` clause. (Non-standard.)
-        if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
         /// One or more objects to drop. (ANSI SQL requires exactly one.)
         names: Vec<ObjectName>,
         /// Whether `CASCADE` was specified. This will be `false` when
         /// `RESTRICT` or no drop behavior at all was specified.
-        cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
         /// Hive allows you specify whether the table's stored data will be
         /// deleted along with the dropped table
-        purge: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] purge: bool,
     },
     /// DECLARE - Declaring Cursor Variables
     ///
@@ -1076,19 +1091,19 @@ pub enum Statement {
         /// Cursor name
         name: Ident,
         /// Causes the cursor to return data in binary rather than in text format.
-        binary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] binary: bool,
         /// None = Not specified
         /// Some(true) = INSENSITIVE
         /// Some(false) = ASENSITIVE
-        sensitive: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] sensitive: Option<bool>,
         /// None = Not specified
         /// Some(true) = SCROLL
         /// Some(false) = NO SCROLL
-        scroll: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] scroll: Option<bool>,
         /// None = Not specified
         /// Some(true) = WITH HOLD, specifies that the cursor can continue to be used after the transaction that created it successfully commits
         /// Some(false) = WITHOUT HOLD, specifies that the cursor cannot be used outside of the transaction that created it
-        hold: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] hold: Option<bool>,
         query: Box<Query>,
     },
     /// FETCH - retrieve rows from a query using a cursor
@@ -1112,9 +1127,9 @@ pub enum Statement {
     /// Note: this is a PostgreSQL-specific statement,
     /// but may also compatible with other SQL.
     SetRole {
-        local: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] local: bool,
         // SESSION is the default if neither SESSION nor LOCAL appears.
-        session: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] session: bool,
         role_name: Option<Ident>,
     },
     /// SET <variable>
@@ -1123,8 +1138,8 @@ pub enum Statement {
     /// least MySQL and PostgreSQL. Not all MySQL-specific syntatic forms are
     /// supported yet.
     SetVariable {
-        local: bool,
-        hivevar: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] local: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] hivevar: bool,
         variable: ObjectName,
         value: Vec<Expr>,
     },
@@ -1132,8 +1147,8 @@ pub enum Statement {
     ///
     /// Note: this is a MySQL-specific statement.
     SetNames {
-        charset_name: String,
-        collation_name: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] charset_name: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] collation_name: Option<String>,
     },
     /// SET NAMES DEFAULT
     ///
@@ -1158,8 +1173,8 @@ pub enum Statement {
     ///
     /// Note: this is a MySQL-specific statement.
     ShowColumns {
-        extended: bool,
-        full: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] extended: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] full: bool,
         table_name: ObjectName,
         filter: Option<ShowStatementFilter>,
     },
@@ -1167,8 +1182,8 @@ pub enum Statement {
     ///
     /// Note: this is a MySQL-specific statement.
     ShowTables {
-        extended: bool,
-        full: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] extended: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] full: bool,
         db_name: Option<Ident>,
         filter: Option<ShowStatementFilter>,
     },
@@ -1186,7 +1201,7 @@ pub enum Statement {
     SetTransaction {
         modes: Vec<TransactionMode>,
         snapshot: Option<Value>,
-        session: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] session: bool,
     },
     /// `COMMENT ON ...`
     ///
@@ -1194,31 +1209,31 @@ pub enum Statement {
     Comment {
         object_type: CommentObject,
         object_name: ObjectName,
-        comment: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] comment: Option<String>,
     },
     /// `COMMIT [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]`
-    Commit { chain: bool },
+    Commit { #[cfg_attr(feature = "derive-visitor", drive(skip))] chain: bool },
     /// `ROLLBACK [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]`
-    Rollback { chain: bool },
+    Rollback { #[cfg_attr(feature = "derive-visitor", drive(skip))] chain: bool },
     /// CREATE SCHEMA
     CreateSchema {
         schema_name: ObjectName,
-        if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
     },
     /// CREATE DATABASE
     CreateDatabase {
         db_name: ObjectName,
-        if_not_exists: bool,
-        location: Option<String>,
-        managed_location: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] location: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] managed_location: Option<String>,
     },
     /// CREATE FUNCTION
     ///
     /// Hive: https://cwiki.apache.org/confluence/display/hive/languagemanual+ddl#LanguageManualDDL-Create/Drop/ReloadFunction
     CreateFunction {
-        temporary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] temporary: bool,
         name: ObjectName,
-        class_name: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] class_name: String,
         using: Option<CreateFunctionUsing>,
     },
     /// `ASSERT <condition> [AS <message>]`
@@ -1231,7 +1246,7 @@ pub enum Statement {
         privileges: Privileges,
         objects: GrantObjects,
         grantees: Vec<Ident>,
-        with_grant_option: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_grant_option: bool,
         granted_by: Option<Ident>,
     },
     /// REVOKE privileges ON objects FROM grantees
@@ -1240,12 +1255,12 @@ pub enum Statement {
         objects: GrantObjects,
         grantees: Vec<Ident>,
         granted_by: Option<Ident>,
-        cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
     },
     /// `DEALLOCATE [ PREPARE ] { name | ALL }`
     ///
     /// Note: this is a PostgreSQL-specific statement.
-    Deallocate { name: Ident, prepare: bool },
+    Deallocate { name: Ident, #[cfg_attr(feature = "derive-visitor", drive(skip))] prepare: bool },
     /// `EXECUTE name [ ( parameter [, ...] ) ]`
     ///
     /// Note: this is a PostgreSQL-specific statement.
@@ -1265,24 +1280,24 @@ pub enum Statement {
     Kill {
         modifier: Option<KillType>,
         // processlist_id
-        id: u64,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] id: u64,
     },
     /// EXPLAIN TABLE
     /// Note: this is a MySQL-specific statement. See <https://dev.mysql.com/doc/refman/8.0/en/explain.html>
     ExplainTable {
         // If true, query used the MySQL `DESCRIBE` alias for explain
-        describe_alias: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] describe_alias: bool,
         // Table name
         table_name: ObjectName,
     },
     /// EXPLAIN / DESCRIBE for select_statement
     Explain {
         // If true, query used the MySQL `DESCRIBE` alias for explain
-        describe_alias: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] describe_alias: bool,
         /// Carry out the command and show actual run times and other statistics.
-        analyze: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] analyze: bool,
         // Display additional information regarding the plan.
-        verbose: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] verbose: bool,
         /// A SQL query that specifies what to explain
         statement: Box<Statement>,
     },
@@ -1291,7 +1306,7 @@ pub enum Statement {
     // MERGE INTO statement, based on Snowflake. See <https://docs.snowflake.com/en/sql-reference/sql/merge.html>
     Merge {
         // optional INTO keyword
-        into: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] into: bool,
         // Specifies the table to merge
         table: TableFactor,
         // Specifies the table or subquery to join with the target table
@@ -1782,10 +1797,10 @@ impl fmt::Display for Statement {
                 }
 
                 if let Some(HiveFormat {
-                    row_format,
-                    storage,
-                    location,
-                }) = hive_formats
+                                row_format,
+                                storage,
+                                location,
+                            }) = hive_formats
                 {
                     match row_format {
                         Some(HiveRowFormat::SERDE { class }) => {
@@ -1796,9 +1811,9 @@ impl fmt::Display for Statement {
                     }
                     match storage {
                         Some(HiveIOFormat::IOF {
-                            input_format,
-                            output_format,
-                        }) => write!(
+                                 input_format,
+                                 output_format,
+                             }) => write!(
                             f,
                             " STORED AS INPUTFORMAT {} OUTPUTFORMAT {}",
                             input_format, output_format
@@ -2065,10 +2080,10 @@ impl fmt::Display for Statement {
                 Ok(())
             }
             Statement::Commit { chain } => {
-                write!(f, "COMMIT{}", if *chain { " AND CHAIN" } else { "" },)
+                write!(f, "COMMIT{}", if *chain { " AND CHAIN" } else { "" }, )
             }
             Statement::Rollback { chain } => {
-                write!(f, "ROLLBACK{}", if *chain { " AND CHAIN" } else { "" },)
+                write!(f, "ROLLBACK{}", if *chain { " AND CHAIN" } else { "" }, )
             }
             Statement::CreateSchema {
                 schema_name,
@@ -2181,6 +2196,7 @@ impl fmt::Display for Statement {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 #[non_exhaustive]
 pub enum OnInsert {
     /// ON DUPLICATE KEY UPDATE (MySQL when the key already exists, then execute an update instead)
@@ -2202,11 +2218,12 @@ impl fmt::Display for OnInsert {
 /// Privileges granted in a GRANT statement or revoked in a REVOKE statement.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum Privileges {
     /// All privileges applicable to the object type
     All {
         /// Optional keyword from the spec, ignored in practice
-        with_privileges_keyword: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_privileges_keyword: bool,
     },
     /// Specific privileges (e.g. `SELECT`, `INSERT`)
     Actions(Vec<Action>),
@@ -2238,6 +2255,7 @@ impl fmt::Display for Privileges {
 /// Specific direction for FETCH statement
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum FetchDirection {
     Count { limit: Value },
     Next,
@@ -2301,6 +2319,7 @@ impl fmt::Display for FetchDirection {
 /// A privilege on a database object (table, sequence, etc.).
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum Action {
     Connect,
     Create,
@@ -2350,6 +2369,7 @@ impl fmt::Display for Action {
 /// Objects on which privileges are granted in a GRANT statement.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum GrantObjects {
     /// Grant privileges on `ALL SEQUENCES IN SCHEMA <schema_name> [, ...]`
     AllSequencesInSchema { schemas: Vec<ObjectName> },
@@ -2396,6 +2416,7 @@ impl fmt::Display for GrantObjects {
 /// SQL assignment `foo = expr` as used in SQLUpdate
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Assignment {
     pub id: Vec<Ident>,
     pub value: Expr,
@@ -2409,6 +2430,7 @@ impl fmt::Display for Assignment {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum FunctionArgExpr {
     Expr(Expr),
     /// Qualified wildcard, e.g. `alias.*` or `schema.table.*`.
@@ -2429,6 +2451,7 @@ impl fmt::Display for FunctionArgExpr {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum FunctionArg {
     Named { name: Ident, arg: FunctionArgExpr },
     Unnamed(FunctionArgExpr),
@@ -2445,6 +2468,7 @@ impl fmt::Display for FunctionArg {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CloseCursor {
     All,
     Specific { name: Ident },
@@ -2462,15 +2486,16 @@ impl fmt::Display for CloseCursor {
 /// A function call
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Function {
     pub name: ObjectName,
     pub args: Vec<FunctionArg>,
     pub over: Option<WindowSpec>,
     // aggregate functions may specify eg `COUNT(DISTINCT x)`
-    pub distinct: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub distinct: bool,
     // Some functions must be called without trailing parentheses, for example Postgres
     // do it for current_catalog, current_schema, etc. This flags is used for formatting.
-    pub special: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub special: bool,
 }
 
 impl fmt::Display for Function {
@@ -2498,6 +2523,7 @@ impl fmt::Display for Function {
 /// External table's available file format
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum FileFormat {
     TEXTFILE,
     SEQUENCEFILE,
@@ -2527,8 +2553,9 @@ impl fmt::Display for FileFormat {
 /// [ WITHIN GROUP (ORDER BY <within_group1>[, ...] ) ]`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct ListAgg {
-    pub distinct: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub distinct: bool,
     pub expr: Box<Expr>,
     pub separator: Option<Box<Expr>>,
     pub on_overflow: Option<ListAggOnOverflow>,
@@ -2564,6 +2591,7 @@ impl fmt::Display for ListAgg {
 /// The `ON OVERFLOW` clause of a LISTAGG invocation
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ListAggOnOverflow {
     /// `ON OVERFLOW ERROR`
     Error,
@@ -2571,7 +2599,7 @@ pub enum ListAggOnOverflow {
     /// `ON OVERFLOW TRUNCATE [ <filler> ] WITH[OUT] COUNT`
     Truncate {
         filler: Option<Box<Expr>>,
-        with_count: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_count: bool,
     },
 }
 
@@ -2598,6 +2626,7 @@ impl fmt::Display for ListAggOnOverflow {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ObjectType {
     Table,
     View,
@@ -2618,6 +2647,7 @@ impl fmt::Display for ObjectType {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum KillType {
     Connection,
     Query,
@@ -2638,6 +2668,7 @@ impl fmt::Display for KillType {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum HiveDistributionStyle {
     PARTITIONED {
         columns: Vec<ColumnDef>,
@@ -2645,26 +2676,28 @@ pub enum HiveDistributionStyle {
     CLUSTERED {
         columns: Vec<Ident>,
         sorted_by: Vec<ColumnDef>,
-        num_buckets: i32,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] num_buckets: i32,
     },
     SKEWED {
         columns: Vec<ColumnDef>,
         on: Vec<ColumnDef>,
-        stored_as_directories: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] stored_as_directories: bool,
     },
     NONE,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum HiveRowFormat {
-    SERDE { class: String },
+    SERDE { #[cfg_attr(feature = "derive-visitor", drive(skip))] class: String },
     DELIMITED,
 }
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 #[allow(clippy::large_enum_variant)]
 pub enum HiveIOFormat {
     IOF {
@@ -2678,14 +2711,16 @@ pub enum HiveIOFormat {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct HiveFormat {
     pub row_format: Option<HiveRowFormat>,
     pub storage: Option<HiveIOFormat>,
-    pub location: Option<String>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub location: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct SqlOption {
     pub name: Ident,
     pub value: Value,
@@ -2699,6 +2734,7 @@ impl fmt::Display for SqlOption {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum TransactionMode {
     AccessMode(TransactionAccessMode),
     IsolationLevel(TransactionIsolationLevel),
@@ -2716,6 +2752,7 @@ impl fmt::Display for TransactionMode {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum TransactionAccessMode {
     ReadOnly,
     ReadWrite,
@@ -2733,6 +2770,7 @@ impl fmt::Display for TransactionAccessMode {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum TransactionIsolationLevel {
     ReadUncommitted,
     ReadCommitted,
@@ -2754,9 +2792,10 @@ impl fmt::Display for TransactionIsolationLevel {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ShowStatementFilter {
-    Like(String),
-    ILike(String),
+    Like(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
+    ILike(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     Where(Expr),
 }
 
@@ -2776,6 +2815,7 @@ impl fmt::Display for ShowStatementFilter {
 /// https://sqlite.org/lang_conflict.html
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum SqliteOnConflict {
     Rollback,
     Abort,
@@ -2799,16 +2839,17 @@ impl fmt::Display for SqliteOnConflict {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CopyTarget {
     Stdin,
     Stdout,
     File {
         /// The path name of the input or output file.
-        filename: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] filename: String,
     },
     Program {
         /// A command to execute
-        command: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] command: String,
     },
 }
 
@@ -2830,6 +2871,7 @@ impl fmt::Display for CopyTarget {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum OnCommit {
     DeleteRows,
     PreserveRows,
@@ -2841,21 +2883,22 @@ pub enum OnCommit {
 /// <https://www.postgresql.org/docs/14/sql-copy.html>
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CopyOption {
     /// FORMAT format_name
     Format(Ident),
     /// FREEZE \[ boolean \]
-    Freeze(bool),
+    Freeze(#[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     /// DELIMITER 'delimiter_character'
-    Delimiter(char),
+    Delimiter(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// NULL 'null_string'
-    Null(String),
+    Null(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// HEADER \[ boolean \]
-    Header(bool),
+    Header(#[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     /// QUOTE 'quote_character'
-    Quote(char),
+    Quote(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// ESCAPE 'escape_character'
-    Escape(char),
+    Escape(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// FORCE_QUOTE { ( column_name [, ...] ) | * }
     ForceQuote(Vec<Ident>),
     /// FORCE_NOT_NULL ( column_name [, ...] )
@@ -2863,7 +2906,7 @@ pub enum CopyOption {
     /// FORCE_NULL ( column_name [, ...] )
     ForceNull(Vec<Ident>),
     /// ENCODING 'encoding_name'
-    Encoding(String),
+    Encoding(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
 }
 
 impl fmt::Display for CopyOption {
@@ -2894,13 +2937,14 @@ impl fmt::Display for CopyOption {
 /// <https://www.postgresql.org/docs/8.4/sql-copy.html>
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CopyLegacyOption {
     /// BINARY
     Binary,
     /// DELIMITER \[ AS \] 'delimiter_character'
-    Delimiter(char),
+    Delimiter(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// NULL \[ AS \] 'null_string'
-    Null(String),
+    Null(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// CSV ...
     Csv(Vec<CopyLegacyCsvOption>),
 }
@@ -2922,13 +2966,14 @@ impl fmt::Display for CopyLegacyOption {
 /// <https://www.postgresql.org/docs/8.4/sql-copy.html>
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CopyLegacyCsvOption {
     /// HEADER
     Header,
     /// QUOTE \[ AS \] 'quote_character'
-    Quote(char),
+    Quote(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// ESCAPE \[ AS \] 'escape_character'
-    Escape(char),
+    Escape(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// FORCE QUOTE { column_name [, ...] | * }
     ForceQuote(Vec<Ident>),
     /// FORCE NOT NULL column_name [, ...]
@@ -2953,6 +2998,7 @@ impl fmt::Display for CopyLegacyCsvOption {
 ///
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum MergeClause {
     MatchedUpdate {
         predicate: Option<Expr>,
@@ -3014,6 +3060,7 @@ impl fmt::Display for MergeClause {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum DiscardObject {
     ALL,
     PLANS,
@@ -3034,10 +3081,11 @@ impl fmt::Display for DiscardObject {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CreateFunctionUsing {
-    Jar(String),
-    File(String),
-    Archive(String),
+    Jar(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
+    File(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
+    Archive(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
 }
 
 impl fmt::Display for CreateFunctionUsing {
diff --git a/src/ast/operator.rs b/src/ast/operator.rs
index 1c96ebbcb..5505f74b9 100644
--- a/src/ast/operator.rs
+++ b/src/ast/operator.rs
@@ -17,11 +17,15 @@ use alloc::{string::String, vec::Vec};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 use super::display_separated;
 
 /// Unary operators
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum UnaryOperator {
     Plus,
     Minus,
@@ -59,6 +63,7 @@ impl fmt::Display for UnaryOperator {
 /// Binary operators
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum BinaryOperator {
     Plus,
     Minus,
@@ -90,7 +95,7 @@ pub enum BinaryOperator {
     ///
     /// See [CREATE OPERATOR](https://www.postgresql.org/docs/current/sql-createoperator.html)
     /// for more information.
-    PGCustomBinaryOperator(Vec<String>),
+    PGCustomBinaryOperator(#[cfg_attr(feature = "derive-visitor", drive(skip))] Vec<String>),
 }
 
 impl fmt::Display for BinaryOperator {
diff --git a/src/ast/query.rs b/src/ast/query.rs
index bc5af9e5f..574f7d209 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -16,12 +16,16 @@ use alloc::{boxed::Box, vec::Vec};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 use crate::ast::*;
 
 /// The most complete variant of a `SELECT` query expression, optionally
 /// including `WITH`, `UNION` / other set operations, and `ORDER BY`.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Query {
     /// WITH (common table expressions, or CTEs)
     pub with: Option<With>,
@@ -69,6 +73,7 @@ impl fmt::Display for Query {
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum SetExpr {
     /// Restricted SELECT .. FROM .. HAVING (no ORDER BY or set operations)
     Select(Box<Select>),
@@ -78,7 +83,7 @@ pub enum SetExpr {
     /// UNION/EXCEPT/INTERSECT of two queries
     SetOperation {
         op: SetOperator,
-        all: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] all: bool,
         left: Box<SetExpr>,
         right: Box<SetExpr>,
     },
@@ -109,6 +114,7 @@ impl fmt::Display for SetExpr {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum SetOperator {
     Union,
     Except,
@@ -130,8 +136,9 @@ impl fmt::Display for SetOperator {
 /// to a set operation like `UNION`.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Select {
-    pub distinct: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub distinct: bool,
     /// MSSQL syntax: `TOP (<N>) [ PERCENT ] [ WITH TIES ]`
     pub top: Option<Top>,
     /// projection expressions
@@ -214,6 +221,7 @@ impl fmt::Display for Select {
 /// A hive LATERAL VIEW with potential column aliases
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct LateralView {
     /// LATERAL VIEW
     pub lateral_view: Expr,
@@ -222,7 +230,7 @@ pub struct LateralView {
     /// LATERAL VIEW optional column aliases
     pub lateral_col_alias: Vec<Ident>,
     /// LATERAL VIEW OUTER
-    pub outer: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub outer: bool,
 }
 
 impl fmt::Display for LateralView {
@@ -247,8 +255,9 @@ impl fmt::Display for LateralView {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct With {
-    pub recursive: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub recursive: bool,
     pub cte_tables: Vec<Cte>,
 }
 
@@ -269,6 +278,7 @@ impl fmt::Display for With {
 /// number of columns in the query matches the number of columns in the query.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Cte {
     pub alias: TableAlias,
     pub query: Query,
@@ -288,6 +298,7 @@ impl fmt::Display for Cte {
 /// One item of the comma-separated list following `SELECT`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum SelectItem {
     /// Any expression, not followed by `[ AS ] alias`
     UnnamedExpr(Expr),
@@ -312,6 +323,7 @@ impl fmt::Display for SelectItem {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct TableWithJoins {
     pub relation: TableFactor,
     pub joins: Vec<Join>,
@@ -330,6 +342,7 @@ impl fmt::Display for TableWithJoins {
 /// A table name or a parenthesized subquery with an optional alias
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum TableFactor {
     Table {
         name: ObjectName,
@@ -346,7 +359,7 @@ pub enum TableFactor {
         with_hints: Vec<Expr>,
     },
     Derived {
-        lateral: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] lateral: bool,
         subquery: Box<Query>,
         alias: Option<TableAlias>,
     },
@@ -366,7 +379,7 @@ pub enum TableFactor {
     UNNEST {
         alias: Option<TableAlias>,
         array_expr: Box<Expr>,
-        with_offset: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_offset: bool,
         with_offset_alias: Option<Ident>,
     },
     /// Represents a parenthesized table factor. The SQL spec only allows a
@@ -457,6 +470,7 @@ impl fmt::Display for TableFactor {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct TableAlias {
     pub name: Ident,
     pub columns: Vec<Ident>,
@@ -474,6 +488,7 @@ impl fmt::Display for TableAlias {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Join {
     pub relation: TableFactor,
     pub join_operator: JoinOperator,
@@ -540,6 +555,7 @@ impl fmt::Display for Join {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum JoinOperator {
     Inner(JoinConstraint),
     LeftOuter(JoinConstraint),
@@ -554,6 +570,7 @@ pub enum JoinOperator {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum JoinConstraint {
     On(Expr),
     Using(Vec<Ident>),
@@ -564,12 +581,13 @@ pub enum JoinConstraint {
 /// An `ORDER BY` expression
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct OrderByExpr {
     pub expr: Expr,
     /// Optional `ASC` or `DESC`
-    pub asc: Option<bool>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub asc: Option<bool>,
     /// Optional `NULLS FIRST` or `NULLS LAST`
-    pub nulls_first: Option<bool>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub nulls_first: Option<bool>,
 }
 
 impl fmt::Display for OrderByExpr {
@@ -591,6 +609,7 @@ impl fmt::Display for OrderByExpr {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Offset {
     pub value: Expr,
     pub rows: OffsetRows,
@@ -605,6 +624,7 @@ impl fmt::Display for Offset {
 /// Stores the keyword after `OFFSET <number>`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum OffsetRows {
     /// Omitting ROW/ROWS is non-standard MySQL quirk.
     None,
@@ -624,9 +644,10 @@ impl fmt::Display for OffsetRows {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Fetch {
-    pub with_ties: bool,
-    pub percent: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub with_ties: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub percent: bool,
     pub quantity: Option<Expr>,
 }
 
@@ -644,6 +665,7 @@ impl fmt::Display for Fetch {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum LockType {
     Share,
     Update,
@@ -661,10 +683,11 @@ impl fmt::Display for LockType {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Top {
     /// SQL semantic equivalent of LIMIT but with same structure as FETCH.
-    pub with_ties: bool,
-    pub percent: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub with_ties: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub percent: bool,
     pub quantity: Option<Expr>,
 }
 
@@ -682,6 +705,7 @@ impl fmt::Display for Top {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Values(pub Vec<Vec<Expr>>);
 
 impl fmt::Display for Values {
@@ -699,10 +723,11 @@ impl fmt::Display for Values {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct SelectInto {
-    pub temporary: bool,
-    pub unlogged: bool,
-    pub table: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub temporary: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub unlogged: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub table: bool,
     pub name: ObjectName,
 }
 
diff --git a/src/ast/value.rs b/src/ast/value.rs
index 1260f3f15..01c5180b2 100644
--- a/src/ast/value.rs
+++ b/src/ast/value.rs
@@ -21,30 +21,34 @@ use bigdecimal::BigDecimal;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 use super::Expr;
 
 /// Primitive SQL values such as number and string
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum Value {
     /// Numeric literal
     #[cfg(not(feature = "bigdecimal"))]
-    Number(String, bool),
+    Number(#[cfg_attr(feature = "derive-visitor", drive(skip))] String, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     #[cfg(feature = "bigdecimal")]
-    Number(BigDecimal, bool),
+    Number(#[cfg_attr(feature = "derive-visitor", drive(skip))] BigDecimal, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     /// 'string value'
-    SingleQuotedString(String),
+    SingleQuotedString(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// e'string value' (postgres extension)
     /// <https://www.postgresql.org/docs/8.3/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS
-    EscapedStringLiteral(String),
+    EscapedStringLiteral(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// N'string value'
-    NationalStringLiteral(String),
+    NationalStringLiteral(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// X'hex value'
-    HexStringLiteral(String),
+    HexStringLiteral(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
 
-    DoubleQuotedString(String),
+    DoubleQuotedString(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// Boolean value true or false
-    Boolean(bool),
+    Boolean(#[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     /// INTERVAL literals, roughly in the following format:
     /// `INTERVAL '<value>' [ <leading_field> [ (<leading_precision>) ] ]
     /// [ TO <last_field> [ (<fractional_seconds_precision>) ] ]`,
@@ -56,18 +60,18 @@ pub enum Value {
     Interval {
         value: Box<Expr>,
         leading_field: Option<DateTimeField>,
-        leading_precision: Option<u64>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] leading_precision: Option<u64>,
         last_field: Option<DateTimeField>,
         /// The seconds precision can be specified in SQL source as
         /// `INTERVAL '__' SECOND(_, x)` (in which case the `leading_field`
         /// will be `Second` and the `last_field` will be `None`),
         /// or as `__ TO SECOND(x)`.
-        fractional_seconds_precision: Option<u64>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] fractional_seconds_precision: Option<u64>,
     },
     /// `NULL` value
     Null,
     /// `?` or `$` Prepared statement arg placeholder
-    Placeholder(String),
+    Placeholder(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
 }
 
 impl fmt::Display for Value {
@@ -126,6 +130,7 @@ impl fmt::Display for Value {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum DateTimeField {
     Year,
     Month,
@@ -242,6 +247,7 @@ pub fn escape_escaped_string(s: &str) -> EscapeEscapedStringLiteral<'_> {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum TrimWhereField {
     Both,
     Leading,
diff --git a/src/keywords.rs b/src/keywords.rs
index 30ec735f7..48f35b7e6 100644
--- a/src/keywords.rs
+++ b/src/keywords.rs
@@ -27,6 +27,10 @@
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 /// Defines a string constant for a single keyword: `kw_def!(SELECT);`
 /// expands to `pub const SELECT = "SELECT";`
 macro_rules! kw_def {
@@ -46,6 +50,7 @@ macro_rules! define_keywords {
     ),*) => {
         #[derive(Debug, Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Hash)]
         #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+        #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
         #[allow(non_camel_case_types)]
         pub enum Keyword {
             NoKeyword,
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
index fdd066f61..9e171a115 100644
--- a/src/tokenizer.rs
+++ b/src/tokenizer.rs
@@ -31,6 +31,9 @@ use core::str::Chars;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "derive-visitor")]
+use derive_visitor::{Drive, DriveMut};
+
 use crate::dialect::SnowflakeDialect;
 use crate::dialect::{Dialect, MySqlDialect};
 use crate::keywords::{Keyword, ALL_KEYWORDS, ALL_KEYWORDS_INDEX};
@@ -38,25 +41,26 @@ use crate::keywords::{Keyword, ALL_KEYWORDS, ALL_KEYWORDS_INDEX};
 /// SQL Token enumeration
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum Token {
     /// An end-of-file marker, not a real token
     EOF,
     /// A keyword (like SELECT) or an optionally quoted SQL identifier
     Word(Word),
     /// An unsigned numeric literal
-    Number(String, bool),
+    Number(#[cfg_attr(feature = "derive-visitor", drive(skip))] String, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     /// A character that could not be tokenized
-    Char(char),
+    Char(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// Single quoted string: i.e: 'string'
-    SingleQuotedString(String),
+    SingleQuotedString(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// Double quoted string: i.e: "string"
-    DoubleQuotedString(String),
+    DoubleQuotedString(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// "National" string literal: i.e: N'string'
-    NationalStringLiteral(String),
+    NationalStringLiteral(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// "escaped" string literal, which are an extension to the SQL standard: i.e: e'first \n second' or E 'first \n second'
-    EscapedStringLiteral(String),
+    EscapedStringLiteral(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// Hexadecimal string literal: i.e.: X'deadbeef'
-    HexStringLiteral(String),
+    HexStringLiteral(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// Comma
     Comma,
     /// Whitespace (space, tab, etc)
@@ -144,7 +148,7 @@ pub enum Token {
     /// `||/` , a cube root math operator in PostgreSQL
     PGCubeRoot,
     /// `?` or `$` , a prepared statement arg placeholder
-    Placeholder(String),
+    Placeholder(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// ->, used as a operator to extract json field in PostgreSQL
     Arrow,
     /// ->>, used as a operator to extract json field as text in PostgreSQL
@@ -242,14 +246,15 @@ impl Token {
 /// A keyword (like SELECT) or an optionally quoted SQL identifier
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Word {
     /// The value of the token, without the enclosing quotes, and with the
     /// escape sequences (if any) processed (TODO: escapes are not handled)
-    pub value: String,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub value: String,
     /// An identifier can be "quoted" (&lt;delimited identifier> in ANSI parlance).
     /// The standard and most implementations allow using double quotes for this,
     /// but some implementations support other quoting styles as well (e.g. \[MS SQL])
-    pub quote_style: Option<char>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub quote_style: Option<char>,
     /// If the word was not quoted and it matched one of the known keywords,
     /// this will have one of the values from dialect::keywords, otherwise empty
     pub keyword: Keyword,
@@ -280,12 +285,13 @@ impl Word {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum Whitespace {
     Space,
     Newline,
     Tab,
-    SingleLineComment { comment: String, prefix: String },
-    MultiLineComment(String),
+    SingleLineComment { #[cfg_attr(feature = "derive-visitor", drive(skip))] comment: String, #[cfg_attr(feature = "derive-visitor", drive(skip))] prefix: String },
+    MultiLineComment(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
 }
 
 impl fmt::Display for Whitespace {
@@ -458,31 +464,31 @@ impl<'a> Tokenizer<'a> {
                 // double quoted string
                 '\"' if !self.dialect.is_delimited_identifier_start(ch)
                     && !self.dialect.is_identifier_start(ch) =>
-                {
-                    let s = self.tokenize_quoted_string(chars, '"')?;
+                    {
+                        let s = self.tokenize_quoted_string(chars, '"')?;
 
-                    Ok(Some(Token::DoubleQuotedString(s)))
-                }
+                        Ok(Some(Token::DoubleQuotedString(s)))
+                    }
                 // delimited (quoted) identifier
                 quote_start
-                    if self.dialect.is_delimited_identifier_start(ch)
-                        && self
-                            .dialect
-                            .is_proper_identifier_inside_quotes(chars.clone()) =>
-                {
-                    chars.next(); // consume the opening quote
-                    let quote_end = Word::matching_end_quote(quote_start);
-                    let (s, last_char) = parse_quoted_ident(chars, quote_end);
-
-                    if last_char == Some(quote_end) {
-                        Ok(Some(Token::make_word(&s, Some(quote_start))))
-                    } else {
-                        self.tokenizer_error(format!(
-                            "Expected close delimiter '{}' before EOF.",
-                            quote_end
-                        ))
+                if self.dialect.is_delimited_identifier_start(ch)
+                    && self
+                    .dialect
+                    .is_proper_identifier_inside_quotes(chars.clone()) =>
+                    {
+                        chars.next(); // consume the opening quote
+                        let quote_end = Word::matching_end_quote(quote_start);
+                        let (s, last_char) = parse_quoted_ident(chars, quote_end);
+
+                        if last_char == Some(quote_end) {
+                            Ok(Some(Token::make_word(&s, Some(quote_start))))
+                        } else {
+                            self.tokenizer_error(format!(
+                                "Expected close delimiter '{}' before EOF.",
+                                quote_end
+                            ))
+                        }
                     }
-                }
                 // numbers and period
                 '0'..='9' | '.' => {
                     let mut s = peeking_take_while(chars, |ch| matches!(ch, '0'..='9'));
@@ -991,6 +997,7 @@ mod tests {
 
         compare(expected, tokens);
     }
+
     #[test]
     fn tokenize_bitwise_op() {
         let sql = String::from("SELECT one | two ^ three");
@@ -1219,7 +1226,7 @@ mod tests {
             Err(TokenizerError {
                 message: "Unterminated string literal".to_string(),
                 line: 1,
-                col: 8
+                col: 8,
             })
         );
     }
@@ -1235,7 +1242,7 @@ mod tests {
             Err(TokenizerError {
                 message: "Unterminated string literal".to_string(),
                 line: 1,
-                col: 35
+                col: 35,
             })
         );
     }
@@ -1394,7 +1401,7 @@ mod tests {
             Err(TokenizerError {
                 message: "Expected close delimiter '\"' before EOF.".to_string(),
                 line: 1,
-                col: 1
+                col: 1,
             })
         );
     }
diff --git a/tests/sqlparser_visitor.rs b/tests/sqlparser_visitor.rs
new file mode 100644
index 000000000..875e6c676
--- /dev/null
+++ b/tests/sqlparser_visitor.rs
@@ -0,0 +1,20 @@
+#[cfg(feature = "derive-visitor")]
+mod test {
+    use sqlparser::parser::Parser;
+    use sqlparser::ast::{TableFactor, ObjectName};
+    use sqlparser::ast::TableFactor::Table;
+    use sqlparser::dialect::GenericDialect;
+    use derive_visitor::{DriveMut, visitor_enter_fn_mut};
+
+    #[test]
+    fn test_visitor() {
+        let sql = "SELECT x FROM table_a JOIN table_b";
+        let mut ast = Parser::parse_sql(&GenericDialect, sql).unwrap();
+        ast.drive_mut(&mut visitor_enter_fn_mut(|table: &mut TableFactor| {
+            if let Table { name: ObjectName(parts), .. } = table {
+                parts[0].value = parts[0].value.replace("table_", "");
+            }
+        }));
+        assert_eq!(ast[0].to_string(), "SELECT x FROM a JOIN b");
+    }
+}
\ No newline at end of file

From 4e1b1ae332e4aa644d272e38cdb4449af183a749 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Sun, 4 Sep 2022 22:28:42 +0200
Subject: [PATCH 02/13] re-expose visitor functions and methods

---
 src/ast/mod.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index 9768aecae..9bb5f433b 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -29,7 +29,10 @@ use core::fmt;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "derive-visitor")]
-use derive_visitor::{Drive, DriveMut};
+pub use derive_visitor::{
+    visitor_fn, visitor_enter_fn, visitor_enter_fn_mut, visitor_fn_mut,
+    Visitor, VisitorMut, Drive, DriveMut,
+};
 
 pub use self::data_type::DataType;
 pub use self::ddl::{

From 55aa55664df760997d23aa6de6fe7ec5605c5a6d Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Mon, 5 Sep 2022 16:54:44 +0200
Subject: [PATCH 03/13] expose VisitorEvent

---
 src/ast/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index 9bb5f433b..d93019cf7 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -31,7 +31,7 @@ use serde::{Deserialize, Serialize};
 #[cfg(feature = "derive-visitor")]
 pub use derive_visitor::{
     visitor_fn, visitor_enter_fn, visitor_enter_fn_mut, visitor_fn_mut,
-    Visitor, VisitorMut, Drive, DriveMut,
+    Visitor, VisitorMut, Drive, DriveMut, Event as VisitorEvent
 };
 
 pub use self::data_type::DataType;

From 9d9211a3a3fb18cfdec3727a45edf5bf20f668d2 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Mon, 5 Sep 2022 19:29:43 +0200
Subject: [PATCH 04/13] Use derive-visitor from upstream

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index debfdf028..ad5a471a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ serde = { version = "1.0", features = ["derive"], optional = true }
 # of dev-dependencies because of
 # https://github.com/rust-lang/cargo/issues/1596
 serde_json = { version = "1.0", optional = true }
-derive-visitor = { version = "0.3.0", git = "https://github.com/lovasoa/derive-visitor.git", branch = "issue8-implement-mutable-visit", optional = true }
+derive-visitor = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
 simple_logger = "2.1"

From 46c4ab13e3613e7479a8d5c199fd166432977bb5 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Tue, 27 Sep 2022 18:03:11 +0200
Subject: [PATCH 05/13] cargo +nightly fmt

---
 src/ast/data_type.rs       |   5 +-
 src/ast/ddl.rs             |  24 ++-
 src/ast/mod.rs             | 370 ++++++++++++++++++++++++-------------
 src/ast/query.rs           |  45 +++--
 src/ast/value.rs           |  10 +-
 src/keywords.rs            |   1 -
 src/tokenizer.rs           |  60 +++---
 tests/sqlparser_visitor.rs |  14 +-
 8 files changed, 346 insertions(+), 183 deletions(-)

diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
index a6d7e6909..3edd35e7e 100644
--- a/src/ast/data_type.rs
+++ b/src/ast/data_type.rs
@@ -46,7 +46,10 @@ pub enum DataType {
     /// Large binary object e.g. BLOB(1000)
     Blob(#[cfg_attr(feature = "derive-visitor", drive(skip))] u64),
     /// Decimal type with optional precision and scale e.g. DECIMAL(10,2)
-    Decimal(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>, #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
+    Decimal(
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>,
+    ),
     /// Floating point with optional precision e.g. FLOAT(8)
     Float(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Tiny integer with optional display width e.g. TINYINT or TINYINT(3)
diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
index 62ae582b5..c56be67f1 100644
--- a/src/ast/ddl.rs
+++ b/src/ast/ddl.rs
@@ -38,15 +38,19 @@ pub enum AlterTableOperation {
     AddColumn { column_def: ColumnDef },
     /// `DROP CONSTRAINT [ IF EXISTS ] <name>`
     DropConstraint {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_exists: bool,
         name: Ident,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        cascade: bool,
     },
     /// `DROP [ COLUMN ] [ IF EXISTS ] <column_name> [ CASCADE ]`
     DropColumn {
         column_name: Ident,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        cascade: bool,
     },
     /// `RENAME TO PARTITION (partition=val)`
     RenamePartitions {
@@ -55,12 +59,14 @@ pub enum AlterTableOperation {
     },
     /// Add Partitions
     AddPartitions {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_not_exists: bool,
         new_partitions: Vec<Expr>,
     },
     DropPartitions {
         partitions: Vec<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_exists: bool,
     },
     /// `RENAME [ COLUMN ] <old_column_name> TO <new_column_name>`
     RenameColumn {
@@ -233,7 +239,8 @@ pub enum TableConstraint {
         name: Option<Ident>,
         columns: Vec<Ident>,
         /// Whether this is a `PRIMARY KEY` or just a `UNIQUE` constraint
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] is_primary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        is_primary: bool,
     },
     /// A referential integrity constraint (`[ CONSTRAINT <name> ] FOREIGN KEY (<columns>)
     /// REFERENCES <foreign_table> (<referred_columns>)
@@ -365,7 +372,8 @@ pub enum ColumnOption {
     Default(Expr),
     /// `{ PRIMARY KEY | UNIQUE }`
     Unique {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] is_primary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        is_primary: bool,
     },
     /// A referential integrity constraint (`[FOREIGN KEY REFERENCES
     /// <foreign_table> (<referred_columns>)
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index 968966bdd..be83281e2 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -30,8 +30,8 @@ use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "derive-visitor")]
 pub use derive_visitor::{
-    visitor_fn, visitor_enter_fn, visitor_enter_fn_mut, visitor_fn_mut,
-    Visitor, VisitorMut, Drive, DriveMut, Event as VisitorEvent
+    visitor_enter_fn, visitor_enter_fn_mut, visitor_fn, visitor_fn_mut, Drive, DriveMut,
+    Event as VisitorEvent, Visitor, VisitorMut,
 };
 
 pub use self::data_type::DataType;
@@ -48,16 +48,16 @@ pub use self::query::{
 pub use self::value::{DateTimeField, TrimWhereField, Value};
 
 struct DisplaySeparated<'a, T>
-    where
-        T: fmt::Display,
+where
+    T: fmt::Display,
 {
     slice: &'a [T],
     sep: &'static str,
 }
 
 impl<'a, T> fmt::Display for DisplaySeparated<'a, T>
-    where
-        T: fmt::Display,
+where
+    T: fmt::Display,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut delim = "";
@@ -71,15 +71,15 @@ impl<'a, T> fmt::Display for DisplaySeparated<'a, T>
 }
 
 fn display_separated<'a, T>(slice: &'a [T], sep: &'static str) -> DisplaySeparated<'a, T>
-    where
-        T: fmt::Display,
+where
+    T: fmt::Display,
 {
     DisplaySeparated { slice, sep }
 }
 
 fn display_comma_separated<T>(slice: &[T]) -> DisplaySeparated<'_, T>
-    where
-        T: fmt::Display,
+where
+    T: fmt::Display,
 {
     DisplaySeparated { slice, sep: ", " }
 }
@@ -89,17 +89,19 @@ fn display_comma_separated<T>(slice: &[T]) -> DisplaySeparated<'_, T>
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Ident {
     /// The value of the identifier without quotes.
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub value: String,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub value: String,
     /// The starting quote if any. Valid quote characters are the single quote,
     /// double quote, backtick, and opening square bracket.
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub quote_style: Option<char>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub quote_style: Option<char>,
 }
 
 impl Ident {
     /// Create a new identifier with the given value and no quotes.
     pub fn new<S>(value: S) -> Self
-        where
-            S: Into<String>,
+    where
+        S: Into<String>,
     {
         Ident {
             value: value.into(),
@@ -110,8 +112,8 @@ impl Ident {
     /// Create a new quoted identifier with the given quote and value. This function
     /// panics if the given quote is not a valid quote character.
     pub fn with_quote<S>(quote: char, value: S) -> Self
-        where
-            S: Into<String>,
+    where
+        S: Into<String>,
     {
         assert!(quote == '\'' || quote == '"' || quote == '`' || quote == '[');
         Ident {
@@ -166,7 +168,8 @@ pub struct Array {
     pub elem: Vec<Expr>,
 
     /// `true` for  `ARRAY[..]`, `false` for `[..]`
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub named: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub named: bool,
 }
 
 impl fmt::Display for Array {
@@ -259,24 +262,28 @@ pub enum Expr {
     InList {
         expr: Box<Expr>,
         list: Vec<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
     },
     /// `[ NOT ] IN (SELECT ...)`
     InSubquery {
         expr: Box<Expr>,
         subquery: Box<Query>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
     },
     /// `[ NOT ] IN UNNEST(array_expression)`
     InUnnest {
         expr: Box<Expr>,
         array_expr: Box<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
     },
     /// `<expr> [ NOT ] BETWEEN <low> AND <high>`
     Between {
         expr: Box<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
         low: Box<Expr>,
         high: Box<Expr>,
     },
@@ -288,24 +295,30 @@ pub enum Expr {
     },
     /// LIKE
     Like {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
         expr: Box<Expr>,
         pattern: Box<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] escape_char: Option<char>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        escape_char: Option<char>,
     },
     /// ILIKE (case-insensitive LIKE)
     ILike {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
         expr: Box<Expr>,
         pattern: Box<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] escape_char: Option<char>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        escape_char: Option<char>,
     },
     /// SIMILAR TO regex
     SimilarTo {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
         expr: Box<Expr>,
         pattern: Box<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] escape_char: Option<char>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        escape_char: Option<char>,
     },
     /// Any operation e.g. `1 ANY (1)` or `foo > ANY(bar)`, It will be wrapped in the right side of BinaryExpr
     AnyOp(Box<Expr>),
@@ -334,7 +347,8 @@ pub enum Expr {
     /// AT a timestamp to a different timezone e.g. `FROM_UNIXTIME(0) AT TIME ZONE 'UTC-06:00'`
     AtTimeZone {
         timestamp: Box<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] time_zone: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        time_zone: String,
     },
     /// EXTRACT(DateTimeField FROM <expr>)
     Extract {
@@ -377,7 +391,11 @@ pub enum Expr {
     /// A constant of form `<data_type> 'value'`.
     /// This can represent ANSI SQL `DATE`, `TIME`, and `TIMESTAMP` literals (such as `DATE '2020-01-01'`),
     /// as well as constants of other types (a non-standard PostgreSQL extension).
-    TypedString { data_type: DataType, #[cfg_attr(feature = "derive-visitor", drive(skip))] value: String },
+    TypedString {
+        data_type: DataType,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        value: String,
+    },
     /// Access a map-like object by field (e.g. `column['field']` or `column[4]`
     /// Note that depending on the dialect, struct like accesses may be
     /// parsed as [`ArrayIndex`] or [`MapAccess`]
@@ -400,7 +418,11 @@ pub enum Expr {
     },
     /// An exists expression `[ NOT ] EXISTS(SELECT ...)`, used in expressions like
     /// `WHERE [ NOT ] EXISTS (SELECT ...)`.
-    Exists { subquery: Box<Query>, #[cfg_attr(feature = "derive-visitor", drive(skip))] negated: bool },
+    Exists {
+        subquery: Box<Query>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        negated: bool,
+    },
     /// A parenthesized subquery `(SELECT ...)`, used in expression like
     /// `SELECT (subquery) AS x` or `WHERE (subquery) = x`
     Subquery(Box<Query>),
@@ -431,13 +453,15 @@ pub enum Expr {
     Interval {
         value: Box<Expr>,
         leading_field: Option<DateTimeField>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] leading_precision: Option<u64>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        leading_precision: Option<u64>,
         last_field: Option<DateTimeField>,
         /// The seconds precision can be specified in SQL source as
         /// `INTERVAL '__' SECOND(_, x)` (in which case the `leading_field`
         /// will be `Second` and the `last_field` will be `None`),
         /// or as `__ TO SECOND(x)`.
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] fractional_seconds_precision: Option<u64>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        fractional_seconds_precision: Option<u64>,
     },
 }
 
@@ -989,11 +1013,15 @@ pub enum Statement {
     Analyze {
         table_name: ObjectName,
         partitions: Option<Vec<Expr>>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] for_columns: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        for_columns: bool,
         columns: Vec<Ident>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] cache_metadata: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] noscan: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] compute_statistics: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        cache_metadata: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        noscan: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        compute_statistics: bool,
     },
     /// Truncate (Hive)
     Truncate {
@@ -1003,7 +1031,8 @@ pub enum Statement {
     /// Msck (Hive)
     Msck {
         table_name: ObjectName,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] repair: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        repair: bool,
         partition_action: Option<AddDropSync>,
     },
     /// SELECT
@@ -1013,13 +1042,15 @@ pub enum Statement {
         /// Only for Sqlite
         or: Option<SqliteOnConflict>,
         /// INTO - optional keyword
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] into: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        into: bool,
         /// TABLE
         table_name: ObjectName,
         /// COLUMNS
         columns: Vec<Ident>,
         /// Overwrite (Hive)
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] overwrite: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        overwrite: bool,
         /// A SQL query that specifies what to insert
         source: Box<Query>,
         /// partitioned insert (Hive)
@@ -1027,14 +1058,18 @@ pub enum Statement {
         /// Columns defined after PARTITION
         after_columns: Vec<Ident>,
         /// whether the insert has the table keyword (Hive)
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] table: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        table: bool,
         on: Option<OnInsert>,
     },
     // TODO: Support ROW FORMAT
     Directory {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] overwrite: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] local: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] path: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        overwrite: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        local: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        path: String,
         file_format: Option<FileFormat>,
         source: Box<Query>,
     },
@@ -1044,7 +1079,8 @@ pub enum Statement {
         /// COLUMNS
         columns: Vec<Ident>,
         /// If true, is a 'COPY TO' statement. If false is a 'COPY FROM'
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] to: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        to: bool,
         /// The source of 'COPY FROM', or the target of 'COPY TO'
         target: CopyTarget,
         /// WITH options (from PostgreSQL version 9.0)
@@ -1052,7 +1088,8 @@ pub enum Statement {
         /// WITH options (before PostgreSQL version 9.0)
         legacy_options: Vec<CopyLegacyOption>,
         /// VALUES a vector of values to be copied
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] values: Vec<Option<String>>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        values: Vec<Option<String>>,
     },
     /// Close - closes the portal underlying an open cursor.
     Close {
@@ -1081,8 +1118,10 @@ pub enum Statement {
     },
     /// CREATE VIEW
     CreateView {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] or_replace: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] materialized: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        or_replace: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        materialized: bool,
         /// View name
         name: ObjectName,
         columns: Vec<Ident>,
@@ -1091,11 +1130,16 @@ pub enum Statement {
     },
     /// CREATE TABLE
     CreateTable {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] or_replace: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] temporary: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] external: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] global: Option<bool>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        or_replace: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        temporary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        external: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        global: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_not_exists: bool,
         /// Table name
         name: ObjectName,
         /// Optional schema
@@ -1106,23 +1150,31 @@ pub enum Statement {
         table_properties: Vec<SqlOption>,
         with_options: Vec<SqlOption>,
         file_format: Option<FileFormat>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] location: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        location: Option<String>,
         query: Option<Box<Query>>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] without_rowid: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        without_rowid: bool,
         like: Option<ObjectName>,
         clone: Option<ObjectName>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] engine: Option<String>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] default_charset: Option<String>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] collation: Option<String>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] on_commit: Option<OnCommit>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        engine: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        default_charset: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        collation: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        on_commit: Option<OnCommit>,
         /// Click house "ON CLUSTER" clause:
         /// <https://clickhouse.com/docs/en/sql-reference/distributed-ddl/>
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] on_cluster: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        on_cluster: Option<String>,
     },
     /// SQLite's `CREATE VIRTUAL TABLE .. USING <module_name> (<module_args>)`
     CreateVirtualTable {
         name: ObjectName,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_not_exists: bool,
         module_name: Ident,
         module_args: Vec<Ident>,
     },
@@ -1132,22 +1184,32 @@ pub enum Statement {
         name: ObjectName,
         table_name: ObjectName,
         columns: Vec<OrderByExpr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] unique: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        unique: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_not_exists: bool,
     },
     /// CREATE ROLE
     CreateRole {
         names: Vec<ObjectName>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_not_exists: bool,
         // Postgres
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] login: Option<bool>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] inherit: Option<bool>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] bypassrls: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        login: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        inherit: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        bypassrls: Option<bool>,
         password: Option<Password>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] superuser: Option<bool>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] create_db: Option<bool>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] create_role: Option<bool>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] replication: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        superuser: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        create_db: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        create_role: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        replication: Option<bool>,
         connection_limit: Option<Expr>,
         valid_until: Option<Expr>,
         in_role: Vec<Ident>,
@@ -1167,15 +1229,18 @@ pub enum Statement {
         /// The type of the object to drop: TABLE, VIEW, etc.
         object_type: ObjectType,
         /// An optional `IF EXISTS` clause. (Non-standard.)
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_exists: bool,
         /// One or more objects to drop. (ANSI SQL requires exactly one.)
         names: Vec<ObjectName>,
         /// Whether `CASCADE` was specified. This will be `false` when
         /// `RESTRICT` or no drop behavior at all was specified.
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        cascade: bool,
         /// Hive allows you specify whether the table's stored data will be
         /// deleted along with the dropped table
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] purge: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        purge: bool,
     },
     /// DECLARE - Declaring Cursor Variables
     ///
@@ -1185,19 +1250,23 @@ pub enum Statement {
         /// Cursor name
         name: Ident,
         /// Causes the cursor to return data in binary rather than in text format.
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] binary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        binary: bool,
         /// None = Not specified
         /// Some(true) = INSENSITIVE
         /// Some(false) = ASENSITIVE
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] sensitive: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        sensitive: Option<bool>,
         /// None = Not specified
         /// Some(true) = SCROLL
         /// Some(false) = NO SCROLL
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] scroll: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        scroll: Option<bool>,
         /// None = Not specified
         /// Some(true) = WITH HOLD, specifies that the cursor can continue to be used after the transaction that created it successfully commits
         /// Some(false) = WITHOUT HOLD, specifies that the cursor cannot be used outside of the transaction that created it
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] hold: Option<bool>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        hold: Option<bool>,
         query: Box<Query>,
     },
     /// FETCH - retrieve rows from a query using a cursor
@@ -1221,9 +1290,11 @@ pub enum Statement {
     /// Note: this is a PostgreSQL-specific statement,
     /// but may also compatible with other SQL.
     SetRole {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] local: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        local: bool,
         // SESSION is the default if neither SESSION nor LOCAL appears.
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] session: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        session: bool,
         role_name: Option<Ident>,
     },
     /// SET <variable>
@@ -1232,8 +1303,10 @@ pub enum Statement {
     /// least MySQL and PostgreSQL. Not all MySQL-specific syntatic forms are
     /// supported yet.
     SetVariable {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] local: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] hivevar: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        local: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        hivevar: bool,
         variable: ObjectName,
         value: Vec<Expr>,
     },
@@ -1241,8 +1314,10 @@ pub enum Statement {
     ///
     /// Note: this is a MySQL-specific statement.
     SetNames {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] charset_name: String,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] collation_name: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        charset_name: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        collation_name: Option<String>,
     },
     /// SET NAMES DEFAULT
     ///
@@ -1271,8 +1346,10 @@ pub enum Statement {
     ///
     /// Note: this is a MySQL-specific statement.
     ShowColumns {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] extended: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] full: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        extended: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        full: bool,
         table_name: ObjectName,
         filter: Option<ShowStatementFilter>,
     },
@@ -1280,8 +1357,10 @@ pub enum Statement {
     ///
     /// Note: this is a MySQL-specific statement.
     ShowTables {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] extended: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] full: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        extended: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        full: bool,
         db_name: Option<Ident>,
         filter: Option<ShowStatementFilter>,
     },
@@ -1299,7 +1378,8 @@ pub enum Statement {
     SetTransaction {
         modes: Vec<TransactionMode>,
         snapshot: Option<Value>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] session: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        session: bool,
     },
     /// `COMMENT ON ...`
     ///
@@ -1307,31 +1387,44 @@ pub enum Statement {
     Comment {
         object_type: CommentObject,
         object_name: ObjectName,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] comment: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        comment: Option<String>,
     },
     /// `COMMIT [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]`
-    Commit { #[cfg_attr(feature = "derive-visitor", drive(skip))] chain: bool },
+    Commit {
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        chain: bool,
+    },
     /// `ROLLBACK [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]`
-    Rollback { #[cfg_attr(feature = "derive-visitor", drive(skip))] chain: bool },
+    Rollback {
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        chain: bool,
+    },
     /// CREATE SCHEMA
     CreateSchema {
         schema_name: ObjectName,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_not_exists: bool,
     },
     /// CREATE DATABASE
     CreateDatabase {
         db_name: ObjectName,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] if_not_exists: bool,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] location: Option<String>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] managed_location: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        if_not_exists: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        location: Option<String>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        managed_location: Option<String>,
     },
     /// CREATE FUNCTION
     ///
     /// Hive: https://cwiki.apache.org/confluence/display/hive/languagemanual+ddl#LanguageManualDDL-Create/Drop/ReloadFunction
     CreateFunction {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] temporary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        temporary: bool,
         name: ObjectName,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] class_name: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        class_name: String,
         using: Option<CreateFunctionUsing>,
     },
     /// `ASSERT <condition> [AS <message>]`
@@ -1344,7 +1437,8 @@ pub enum Statement {
         privileges: Privileges,
         objects: GrantObjects,
         grantees: Vec<Ident>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_grant_option: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        with_grant_option: bool,
         granted_by: Option<Ident>,
     },
     /// REVOKE privileges ON objects FROM grantees
@@ -1353,12 +1447,17 @@ pub enum Statement {
         objects: GrantObjects,
         grantees: Vec<Ident>,
         granted_by: Option<Ident>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] cascade: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        cascade: bool,
     },
     /// `DEALLOCATE [ PREPARE ] { name | ALL }`
     ///
     /// Note: this is a PostgreSQL-specific statement.
-    Deallocate { name: Ident, #[cfg_attr(feature = "derive-visitor", drive(skip))] prepare: bool },
+    Deallocate {
+        name: Ident,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        prepare: bool,
+    },
     /// `EXECUTE name [ ( parameter [, ...] ) ]`
     ///
     /// Note: this is a PostgreSQL-specific statement.
@@ -1378,24 +1477,29 @@ pub enum Statement {
     Kill {
         modifier: Option<KillType>,
         // processlist_id
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] id: u64,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        id: u64,
     },
     /// EXPLAIN TABLE
     /// Note: this is a MySQL-specific statement. See <https://dev.mysql.com/doc/refman/8.0/en/explain.html>
     ExplainTable {
         // If true, query used the MySQL `DESCRIBE` alias for explain
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] describe_alias: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        describe_alias: bool,
         // Table name
         table_name: ObjectName,
     },
     /// EXPLAIN / DESCRIBE for select_statement
     Explain {
         // If true, query used the MySQL `DESCRIBE` alias for explain
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] describe_alias: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        describe_alias: bool,
         /// Carry out the command and show actual run times and other statistics.
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] analyze: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        analyze: bool,
         // Display additional information regarding the plan.
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] verbose: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        verbose: bool,
         /// A SQL query that specifies what to explain
         statement: Box<Statement>,
         /// Optional output format of explain
@@ -1406,7 +1510,8 @@ pub enum Statement {
     // MERGE INTO statement, based on Snowflake. See <https://docs.snowflake.com/en/sql-reference/sql/merge.html>
     Merge {
         // optional INTO keyword
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] into: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        into: bool,
         // Specifies the table to merge
         table: TableFactor,
         // Specifies the table or subquery to join with the target table
@@ -1902,10 +2007,10 @@ impl fmt::Display for Statement {
                 }
 
                 if let Some(HiveFormat {
-                                row_format,
-                                storage,
-                                location,
-                            }) = hive_formats
+                    row_format,
+                    storage,
+                    location,
+                }) = hive_formats
                 {
                     match row_format {
                         Some(HiveRowFormat::SERDE { class }) => {
@@ -1916,9 +2021,9 @@ impl fmt::Display for Statement {
                     }
                     match storage {
                         Some(HiveIOFormat::IOF {
-                                 input_format,
-                                 output_format,
-                             }) => write!(
+                            input_format,
+                            output_format,
+                        }) => write!(
                             f,
                             " STORED AS INPUTFORMAT {} OUTPUTFORMAT {}",
                             input_format, output_format
@@ -2276,10 +2381,10 @@ impl fmt::Display for Statement {
                 Ok(())
             }
             Statement::Commit { chain } => {
-                write!(f, "COMMIT{}", if *chain { " AND CHAIN" } else { "" }, )
+                write!(f, "COMMIT{}", if *chain { " AND CHAIN" } else { "" },)
             }
             Statement::Rollback { chain } => {
-                write!(f, "ROLLBACK{}", if *chain { " AND CHAIN" } else { "" }, )
+                write!(f, "ROLLBACK{}", if *chain { " AND CHAIN" } else { "" },)
             }
             Statement::CreateSchema {
                 schema_name,
@@ -2419,7 +2524,8 @@ pub enum Privileges {
     /// All privileges applicable to the object type
     All {
         /// Optional keyword from the spec, ignored in practice
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_privileges_keyword: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        with_privileges_keyword: bool,
     },
     /// Specific privileges (e.g. `SELECT`, `INSERT`)
     Actions(Vec<Action>),
@@ -2688,10 +2794,12 @@ pub struct Function {
     pub args: Vec<FunctionArg>,
     pub over: Option<WindowSpec>,
     // aggregate functions may specify eg `COUNT(DISTINCT x)`
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub distinct: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub distinct: bool,
     // Some functions must be called without trailing parentheses, for example Postgres
     // do it for current_catalog, current_schema, etc. This flags is used for formatting.
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub special: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub special: bool,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -2770,7 +2878,8 @@ impl fmt::Display for FileFormat {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct ListAgg {
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub distinct: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub distinct: bool,
     pub expr: Box<Expr>,
     pub separator: Option<Box<Expr>>,
     pub on_overflow: Option<ListAggOnOverflow>,
@@ -2814,7 +2923,8 @@ pub enum ListAggOnOverflow {
     /// `ON OVERFLOW TRUNCATE [ <filler> ] WITH[OUT] COUNT`
     Truncate {
         filler: Option<Box<Expr>>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_count: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        with_count: bool,
     },
 }
 
@@ -2893,12 +3003,14 @@ pub enum HiveDistributionStyle {
     CLUSTERED {
         columns: Vec<Ident>,
         sorted_by: Vec<ColumnDef>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] num_buckets: i32,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        num_buckets: i32,
     },
     SKEWED {
         columns: Vec<ColumnDef>,
         on: Vec<ColumnDef>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] stored_as_directories: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        stored_as_directories: bool,
     },
     NONE,
 }
@@ -2907,7 +3019,10 @@ pub enum HiveDistributionStyle {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum HiveRowFormat {
-    SERDE { #[cfg_attr(feature = "derive-visitor", drive(skip))] class: String },
+    SERDE {
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        class: String,
+    },
     DELIMITED,
 }
 
@@ -2932,7 +3047,8 @@ pub enum HiveIOFormat {
 pub struct HiveFormat {
     pub row_format: Option<HiveRowFormat>,
     pub storage: Option<HiveIOFormat>,
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub location: Option<String>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub location: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -3062,11 +3178,13 @@ pub enum CopyTarget {
     Stdout,
     File {
         /// The path name of the input or output file.
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] filename: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        filename: String,
     },
     Program {
         /// A command to execute
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] command: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        command: String,
     },
 }
 
diff --git a/src/ast/query.rs b/src/ast/query.rs
index 62c8d1630..49d2cb5a6 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -83,7 +83,8 @@ pub enum SetExpr {
     /// UNION/EXCEPT/INTERSECT of two queries
     SetOperation {
         op: SetOperator,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] all: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        all: bool,
         left: Box<SetExpr>,
         right: Box<SetExpr>,
     },
@@ -138,7 +139,8 @@ impl fmt::Display for SetOperator {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Select {
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub distinct: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub distinct: bool,
     /// MSSQL syntax: `TOP (<N>) [ PERCENT ] [ WITH TIES ]`
     pub top: Option<Top>,
     /// projection expressions
@@ -230,7 +232,8 @@ pub struct LateralView {
     /// LATERAL VIEW optional column aliases
     pub lateral_col_alias: Vec<Ident>,
     /// LATERAL VIEW OUTER
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub outer: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub outer: bool,
 }
 
 impl fmt::Display for LateralView {
@@ -257,7 +260,8 @@ impl fmt::Display for LateralView {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct With {
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub recursive: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub recursive: bool,
     pub cte_tables: Vec<Cte>,
 }
 
@@ -359,7 +363,8 @@ pub enum TableFactor {
         with_hints: Vec<Expr>,
     },
     Derived {
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] lateral: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        lateral: bool,
         subquery: Box<Query>,
         alias: Option<TableAlias>,
     },
@@ -379,7 +384,8 @@ pub enum TableFactor {
     UNNEST {
         alias: Option<TableAlias>,
         array_expr: Box<Expr>,
-        #[cfg_attr(feature = "derive-visitor", drive(skip))] with_offset: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        with_offset: bool,
         with_offset_alias: Option<Ident>,
     },
     /// Represents a parenthesized table factor. The SQL spec only allows a
@@ -585,9 +591,11 @@ pub enum JoinConstraint {
 pub struct OrderByExpr {
     pub expr: Expr,
     /// Optional `ASC` or `DESC`
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub asc: Option<bool>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub asc: Option<bool>,
     /// Optional `NULLS FIRST` or `NULLS LAST`
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub nulls_first: Option<bool>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub nulls_first: Option<bool>,
 }
 
 impl fmt::Display for OrderByExpr {
@@ -646,8 +654,10 @@ impl fmt::Display for OffsetRows {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Fetch {
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub with_ties: bool,
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub percent: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub with_ties: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub percent: bool,
     pub quantity: Option<Expr>,
 }
 
@@ -686,8 +696,10 @@ impl fmt::Display for LockType {
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Top {
     /// SQL semantic equivalent of LIMIT but with same structure as FETCH.
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub with_ties: bool,
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub percent: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub with_ties: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub percent: bool,
     pub quantity: Option<Expr>,
 }
 
@@ -725,9 +737,12 @@ impl fmt::Display for Values {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct SelectInto {
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub temporary: bool,
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub unlogged: bool,
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub table: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub temporary: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub unlogged: bool,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub table: bool,
     pub name: ObjectName,
 }
 
diff --git a/src/ast/value.rs b/src/ast/value.rs
index 931e68f13..484ed960d 100644
--- a/src/ast/value.rs
+++ b/src/ast/value.rs
@@ -31,9 +31,15 @@ use derive_visitor::{Drive, DriveMut};
 pub enum Value {
     /// Numeric literal
     #[cfg(not(feature = "bigdecimal"))]
-    Number(#[cfg_attr(feature = "derive-visitor", drive(skip))] String, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
+    Number(
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] bool,
+    ),
     #[cfg(feature = "bigdecimal")]
-    Number(#[cfg_attr(feature = "derive-visitor", drive(skip))] BigDecimal, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
+    Number(
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] BigDecimal,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] bool,
+    ),
     /// 'string value'
     SingleQuotedString(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
     /// e'string value' (postgres extension)
diff --git a/src/keywords.rs b/src/keywords.rs
index 32e18cd09..8d52572b7 100644
--- a/src/keywords.rs
+++ b/src/keywords.rs
@@ -27,7 +27,6 @@
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-
 #[cfg(feature = "derive-visitor")]
 use derive_visitor::{Drive, DriveMut};
 
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
index 6d6324a40..95612e419 100644
--- a/src/tokenizer.rs
+++ b/src/tokenizer.rs
@@ -48,7 +48,10 @@ pub enum Token {
     /// A keyword (like SELECT) or an optionally quoted SQL identifier
     Word(Word),
     /// An unsigned numeric literal
-    Number(#[cfg_attr(feature = "derive-visitor", drive(skip))] String, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
+    Number(
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] bool,
+    ),
     /// A character that could not be tokenized
     Char(#[cfg_attr(feature = "derive-visitor", drive(skip))] char),
     /// Single quoted string: i.e: 'string'
@@ -250,11 +253,13 @@ impl Token {
 pub struct Word {
     /// The value of the token, without the enclosing quotes, and with the
     /// escape sequences (if any) processed (TODO: escapes are not handled)
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub value: String,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub value: String,
     /// An identifier can be "quoted" (&lt;delimited identifier> in ANSI parlance).
     /// The standard and most implementations allow using double quotes for this,
     /// but some implementations support other quoting styles as well (e.g. \[MS SQL])
-    #[cfg_attr(feature = "derive-visitor", drive(skip))] pub quote_style: Option<char>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
+    pub quote_style: Option<char>,
     /// If the word was not quoted and it matched one of the known keywords,
     /// this will have one of the values from dialect::keywords, otherwise empty
     pub keyword: Keyword,
@@ -290,7 +295,12 @@ pub enum Whitespace {
     Space,
     Newline,
     Tab,
-    SingleLineComment { #[cfg_attr(feature = "derive-visitor", drive(skip))] comment: String, #[cfg_attr(feature = "derive-visitor", drive(skip))] prefix: String },
+    SingleLineComment {
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        comment: String,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
+        prefix: String,
+    },
     MultiLineComment(#[cfg_attr(feature = "derive-visitor", drive(skip))] String),
 }
 
@@ -465,31 +475,31 @@ impl<'a> Tokenizer<'a> {
                 // double quoted string
                 '\"' if !self.dialect.is_delimited_identifier_start(ch)
                     && !self.dialect.is_identifier_start(ch) =>
-                    {
-                        let s = self.tokenize_quoted_string(chars, '"')?;
+                {
+                    let s = self.tokenize_quoted_string(chars, '"')?;
 
-                        Ok(Some(Token::DoubleQuotedString(s)))
-                    }
+                    Ok(Some(Token::DoubleQuotedString(s)))
+                }
                 // delimited (quoted) identifier
                 quote_start
-                if self.dialect.is_delimited_identifier_start(ch)
-                    && self
-                    .dialect
-                    .is_proper_identifier_inside_quotes(chars.clone()) =>
-                    {
-                        chars.next(); // consume the opening quote
-                        let quote_end = Word::matching_end_quote(quote_start);
-                        let (s, last_char) = parse_quoted_ident(chars, quote_end);
-
-                        if last_char == Some(quote_end) {
-                            Ok(Some(Token::make_word(&s, Some(quote_start))))
-                        } else {
-                            self.tokenizer_error(format!(
-                                "Expected close delimiter '{}' before EOF.",
-                                quote_end
-                            ))
-                        }
+                    if self.dialect.is_delimited_identifier_start(ch)
+                        && self
+                            .dialect
+                            .is_proper_identifier_inside_quotes(chars.clone()) =>
+                {
+                    chars.next(); // consume the opening quote
+                    let quote_end = Word::matching_end_quote(quote_start);
+                    let (s, last_char) = parse_quoted_ident(chars, quote_end);
+
+                    if last_char == Some(quote_end) {
+                        Ok(Some(Token::make_word(&s, Some(quote_start))))
+                    } else {
+                        self.tokenizer_error(format!(
+                            "Expected close delimiter '{}' before EOF.",
+                            quote_end
+                        ))
                     }
+                }
                 // numbers and period
                 '0'..='9' | '.' => {
                     let mut s = peeking_take_while(chars, |ch| matches!(ch, '0'..='9'));
diff --git a/tests/sqlparser_visitor.rs b/tests/sqlparser_visitor.rs
index 875e6c676..2b17e76c4 100644
--- a/tests/sqlparser_visitor.rs
+++ b/tests/sqlparser_visitor.rs
@@ -1,20 +1,24 @@
 #[cfg(feature = "derive-visitor")]
 mod test {
-    use sqlparser::parser::Parser;
-    use sqlparser::ast::{TableFactor, ObjectName};
+    use derive_visitor::{visitor_enter_fn_mut, DriveMut};
     use sqlparser::ast::TableFactor::Table;
+    use sqlparser::ast::{ObjectName, TableFactor};
     use sqlparser::dialect::GenericDialect;
-    use derive_visitor::{DriveMut, visitor_enter_fn_mut};
+    use sqlparser::parser::Parser;
 
     #[test]
     fn test_visitor() {
         let sql = "SELECT x FROM table_a JOIN table_b";
         let mut ast = Parser::parse_sql(&GenericDialect, sql).unwrap();
         ast.drive_mut(&mut visitor_enter_fn_mut(|table: &mut TableFactor| {
-            if let Table { name: ObjectName(parts), .. } = table {
+            if let Table {
+                name: ObjectName(parts),
+                ..
+            } = table
+            {
                 parts[0].value = parts[0].value.replace("table_", "");
             }
         }));
         assert_eq!(ast[0].to_string(), "SELECT x FROM a JOIN b");
     }
-}
\ No newline at end of file
+}

From c33120af4c2ff44a454ce4236e17dd0e5b15ac98 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Tue, 27 Sep 2022 18:09:19 +0200
Subject: [PATCH 06/13] cargo clippy

Fixes mistakenly removed annotations
---
 src/ast/ddl.rs | 1 +
 src/ast/mod.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
index c56be67f1..90a412a59 100644
--- a/src/ast/ddl.rs
+++ b/src/ast/ddl.rs
@@ -450,6 +450,7 @@ fn display_constraint_name(name: &'_ Option<Ident>) -> impl fmt::Display + '_ {
 ///
 /// Used in foreign key constraints in `ON UPDATE` and `ON DELETE` options.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ReferentialAction {
     Restrict,
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index be83281e2..6cb4e61ee 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -86,6 +86,7 @@ where
 
 /// An identifier, decomposed into its value or character data and the quote style.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct Ident {
     /// The value of the identifier without quotes.

From 0b5c12e5b8b4a450309a7476651d756efe9eb794 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Tue, 27 Sep 2022 18:40:38 +0200
Subject: [PATCH 07/13] add tests

---
 tests/sqlparser_visitor.rs | 62 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/tests/sqlparser_visitor.rs b/tests/sqlparser_visitor.rs
index 2b17e76c4..4a39492d4 100644
--- a/tests/sqlparser_visitor.rs
+++ b/tests/sqlparser_visitor.rs
@@ -1,8 +1,9 @@
 #[cfg(feature = "derive-visitor")]
 mod test {
-    use derive_visitor::{visitor_enter_fn_mut, DriveMut};
+    use derive_visitor::{visitor_enter_fn_mut, DriveMut, Drive, Visitor};
+    use sqlparser::ast;
     use sqlparser::ast::TableFactor::Table;
-    use sqlparser::ast::{ObjectName, TableFactor};
+    use sqlparser::ast::{Ident, Join, JoinConstraint, JoinOperator, ObjectName, TableFactor, Value};
     use sqlparser::dialect::GenericDialect;
     use sqlparser::parser::Parser;
 
@@ -21,4 +22,61 @@ mod test {
         }));
         assert_eq!(ast[0].to_string(), "SELECT x FROM a JOIN b");
     }
+
+    #[test]
+    fn test_visitor_add_table_to_join() {
+        let sql = "select a,b from t1";
+        // Table t1 has changed and its fields are now split between tables t1 and t2
+        let mut ast = Parser::parse_sql(&GenericDialect, sql).unwrap();
+        ast[0].drive_mut(&mut visitor_enter_fn_mut(
+            |table: &mut ast::TableWithJoins| {
+                let has_t1 = std::iter::once(&table.relation)
+                    .chain(table.joins.iter().map(|j| &j.relation))
+                    .any(|r| {
+                        matches!(r, TableFactor::Table {name: ObjectName(idents), ..}
+                        if idents[0].value == "t1")
+                    });
+                if has_t1 {
+                    table.joins.push(Join {
+                        relation: Table {
+                            name: ObjectName(vec![Ident::from("t2")]),
+                            alias: None,
+                            args: None,
+                            with_hints: vec![],
+                        },
+                        join_operator: JoinOperator::Inner(JoinConstraint::Using(vec![
+                            Ident::from("t_id"),
+                        ])),
+                    });
+                }
+            },
+        ));
+        assert_eq!(
+            ast[0].to_string(),
+            "SELECT a, b FROM t1 JOIN t2 USING(t_id)"
+        );
+    }
+
+    #[test]
+    fn test_immutable_visitor_count_parameters() {
+        let sql = "select a, b+$x from t1 where c=$y";
+        // Table t1 has changed and its fields are now split between tables t1 and t2
+        let ast = Parser::parse_sql(&GenericDialect, sql).unwrap();
+
+        /// Counts the placeholder in an SQL statement
+        #[derive(Visitor, Default)]
+        #[visitor(Value(enter))]
+        struct PlaceholderCounter(usize);
+        impl PlaceholderCounter {
+            fn enter_value(&mut self, value: &Value) {
+                if let Value::Placeholder(_) = value {
+                    self.0 += 1;
+                }
+            }
+        }
+
+        let mut counter = PlaceholderCounter(0);
+        ast[0].drive(&mut counter);
+        assert_eq!(counter.0, 2, "There are 2 placeholders in the query");
+    }
 }

From efc1e698ef302f9bcb8ed8a6777b55c596443e6c Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Tue, 27 Sep 2022 19:17:32 +0200
Subject: [PATCH 08/13] add more tests and documentation

---
 README.md                  | 19 +++++++++++++++++++
 src/lib.rs                 | 23 +++++++++++++++++++++--
 tests/sqlparser_visitor.rs | 15 +++++++++++++--
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6e9f6290d..6d146265a 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,25 @@ This outputs
 AST: [Query(Query { ctes: [], body: Select(Select { distinct: false, projection: [UnnamedExpr(Identifier("a")), UnnamedExpr(Identifier("b")), UnnamedExpr(Value(Long(123))), UnnamedExpr(Function(Function { name: ObjectName(["myfunc"]), args: [Identifier("b")], over: None, distinct: false }))], from: [TableWithJoins { relation: Table { name: ObjectName(["table_1"]), alias: None, args: [], with_hints: [] }, joins: [] }], selection: Some(BinaryOp { left: BinaryOp { left: Identifier("a"), op: Gt, right: Identifier("b") }, op: And, right: BinaryOp { left: Identifier("b"), op: Lt, right: Value(Long(100)) } }), group_by: [], having: None }), order_by: [OrderByExpr { expr: Identifier("a"), asc: Some(false) }, OrderByExpr { expr: Identifier("b"), asc: None }], limit: None, offset: None, fetch: None })]
 ```
 
+### Analyzing and transforming the AST
+
+Once you have an abstract syntax tree, you can analyze and transform it 
+using the optional [`derive-visitor`](https://github.com/nikis05/derive-visitor) feature.
+
+For instance, if you want to rename all identifiers in a query:
+
+```rust
+use sqlparser::{dialect::GenericDialect, parser::Parser, ast::Ident};
+ use derive_visitor::{visitor_enter_fn_mut, DriveMut};
+
+let mut statements = Parser::parse_sql(&GenericDialect, "select x").unwrap();
+statements[0].drive_mut(&mut visitor_enter_fn_mut(|ident: &mut Ident| {
+    ident.value = ident.value.replace("x", "y");
+}));
+assert_eq!(statements[0].to_string(), "SELECT y");
+```
+
+
 ## Command line
 To parse a file and dump the results as JSON:
 ```
diff --git a/src/lib.rs b/src/lib.rs
index 880c6d6e1..603c97c97 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,12 +25,31 @@
 //!
 //! let sql = "SELECT a, b, 123, myfunc(b) \
 //!            FROM table_1 \
-//!            WHERE a > b AND b < 100 \
+//!            WHERE a > b AND b < $x \
 //!            ORDER BY a DESC, b";
 //!
-//! let ast = Parser::parse_sql(&dialect, sql).unwrap();
+//! let mut ast = Parser::parse_sql(&dialect, sql).unwrap();
 //!
 //! println!("AST: {:?}", ast);
+//!
+//! # #[cfg(feature = "derive-visitor")] {
+//! // You can activate the derive-visitor feature
+//! // to apply transforms to all AST nodes of a given type
+//!
+//! use derive_visitor::{visitor_enter_fn_mut, DriveMut};
+//! use sqlparser::ast;
+//!
+//! ast[0].drive_mut(&mut visitor_enter_fn_mut(|value: &mut ast::Value| {
+//!     if let ast::Value::Placeholder(ref mut placeholder) = value {
+//!         *placeholder += "_transformed";
+//!     }
+//! }));
+//!
+//! assert_eq!(
+//!     ast[0].to_string(),
+//!     "SELECT a, b, 123, myfunc(b) FROM table_1 WHERE a > b AND b < $x_transformed ORDER BY a DESC, b"
+//! );
+//! # }
 //! ```
 
 #![cfg_attr(not(feature = "std"), no_std)]
diff --git a/tests/sqlparser_visitor.rs b/tests/sqlparser_visitor.rs
index 4a39492d4..e23269a14 100644
--- a/tests/sqlparser_visitor.rs
+++ b/tests/sqlparser_visitor.rs
@@ -1,9 +1,11 @@
 #[cfg(feature = "derive-visitor")]
 mod test {
-    use derive_visitor::{visitor_enter_fn_mut, DriveMut, Drive, Visitor};
+    use derive_visitor::{visitor_enter_fn_mut, Drive, DriveMut, Visitor};
     use sqlparser::ast;
     use sqlparser::ast::TableFactor::Table;
-    use sqlparser::ast::{Ident, Join, JoinConstraint, JoinOperator, ObjectName, TableFactor, Value};
+    use sqlparser::ast::{
+        Ident, Join, JoinConstraint, JoinOperator, ObjectName, TableFactor, Value,
+    };
     use sqlparser::dialect::GenericDialect;
     use sqlparser::parser::Parser;
 
@@ -79,4 +81,13 @@ mod test {
         ast[0].drive(&mut counter);
         assert_eq!(counter.0, 2, "There are 2 placeholders in the query");
     }
+
+    #[test]
+    fn test_readme_example() {
+        let mut statements = Parser::parse_sql(&GenericDialect, "select x").unwrap();
+        statements[0].drive_mut(&mut visitor_enter_fn_mut(|ident: &mut Ident| {
+            ident.value = ident.value.replace("x", "y");
+        }));
+        assert_eq!(statements[0].to_string(), "SELECT y");
+    }
 }

From 1d09ff47a3fd516bcc922b2f1a03ce1a9ec966fc Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Tue, 27 Sep 2022 19:22:54 +0200
Subject: [PATCH 09/13] clippy

---
 README.md                  | 6 +++---
 tests/sqlparser_visitor.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6d146265a..618d49264 100644
--- a/README.md
+++ b/README.md
@@ -51,11 +51,11 @@ For instance, if you want to rename all identifiers in a query:
 use sqlparser::{dialect::GenericDialect, parser::Parser, ast::Ident};
  use derive_visitor::{visitor_enter_fn_mut, DriveMut};
 
-let mut statements = Parser::parse_sql(&GenericDialect, "select x").unwrap();
+let mut statements = Parser::parse_sql(&GenericDialect, "select xxx").unwrap();
 statements[0].drive_mut(&mut visitor_enter_fn_mut(|ident: &mut Ident| {
-    ident.value = ident.value.replace("x", "y");
+    ident.value = ident.value.replace("xxx", "yyy");
 }));
-assert_eq!(statements[0].to_string(), "SELECT y");
+assert_eq!(statements[0].to_string(), "SELECT yyy");
 ```
 
 
diff --git a/tests/sqlparser_visitor.rs b/tests/sqlparser_visitor.rs
index e23269a14..768ec573b 100644
--- a/tests/sqlparser_visitor.rs
+++ b/tests/sqlparser_visitor.rs
@@ -84,10 +84,10 @@ mod test {
 
     #[test]
     fn test_readme_example() {
-        let mut statements = Parser::parse_sql(&GenericDialect, "select x").unwrap();
+        let mut statements = Parser::parse_sql(&GenericDialect, "select xxx").unwrap();
         statements[0].drive_mut(&mut visitor_enter_fn_mut(|ident: &mut Ident| {
-            ident.value = ident.value.replace("x", "y");
+            ident.value = ident.value.replace("xxx", "yyy");
         }));
-        assert_eq!(statements[0].to_string(), "SELECT y");
+        assert_eq!(statements[0].to_string(), "SELECT yyy");
     }
 }

From e0e807e4a9ac2ef03930205121653da636a2ad1e Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Mon, 17 Oct 2022 11:09:48 +0200
Subject: [PATCH 10/13] add ast visiting macros

---
 src/ast/data_type.rs | 15 +++++++++++----
 src/ast/mod.rs       | 14 +++++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
index 22e088eea..ed1990866 100644
--- a/src/ast/data_type.rs
+++ b/src/ast/data_type.rs
@@ -46,11 +46,11 @@ pub enum DataType {
     /// Large character object with optional length e.g. CHARACTER LARGE OBJECT, CHARACTER LARGE OBJECT(1000), [standard]
     ///
     /// [standard]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#character-large-object-type
-    CharacterLargeObject(Option<u64>),
+    CharacterLargeObject(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Large character object with optional length e.g. CHAR LARGE OBJECT, CHAR LARGE OBJECT(1000), [standard]
     ///
     /// [standard]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#character-large-object-type
-    CharLargeObject(Option<u64>),
+    CharLargeObject(#[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>),
     /// Large character object with optional length e.g. CLOB, CLOB(1000), [standard]
     ///
     /// [standard]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#character-large-object-type
@@ -327,13 +327,17 @@ impl fmt::Display for TimezoneInfo {
 /// [standard]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#exact-numeric-type
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ExactNumberInfo {
     /// No additional information e.g. `DECIMAL`
     None,
     /// Only precision information e.g. `DECIMAL(10)`
-    Precision(u64),
+    Precision(#[cfg_attr(feature = "derive-visitor", drive(skip))] u64),
     /// Precision and scale information e.g. `DECIMAL(10,2)`
-    PrecisionAndScale(u64, u64),
+    PrecisionAndScale(
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] u64,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] u64,
+    ),
 }
 
 impl fmt::Display for ExactNumberInfo {
@@ -357,8 +361,10 @@ impl fmt::Display for ExactNumberInfo {
 /// [1]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#character-length
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct CharacterLength {
     /// Default (if VARYING) or maximum (if not VARYING) length
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
     pub length: u64,
     /// Optional unit. If not informed, the ANSI handles it as CHARACTERS implicitly
     pub unit: Option<CharLengthUnits>,
@@ -379,6 +385,7 @@ impl fmt::Display for CharacterLength {
 /// [1]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#char-length-units
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum CharLengthUnits {
     /// CHARACTERS unit
     Characters,
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index 403e6f0e5..60e661239 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -22,11 +22,6 @@ use core::fmt;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-#[cfg(feature = "derive-visitor")]
-pub use derive_visitor::{
-    visitor_enter_fn, visitor_enter_fn_mut, visitor_fn, visitor_fn_mut, Drive, DriveMut,
-    Event as VisitorEvent, Visitor, VisitorMut,
-};
 pub use self::data_type::{
     CharLengthUnits, CharacterLength, DataType, ExactNumberInfo, TimezoneInfo,
 };
@@ -41,6 +36,11 @@ pub use self::query::{
     TableFactor, TableWithJoins, Top, Values, With,
 };
 pub use self::value::{DateTimeField, TrimWhereField, Value};
+#[cfg(feature = "derive-visitor")]
+pub use derive_visitor::{
+    visitor_enter_fn, visitor_enter_fn_mut, visitor_fn, visitor_fn_mut, Drive, DriveMut,
+    Event as VisitorEvent, Visitor, VisitorMut,
+};
 
 mod data_type;
 mod ddl;
@@ -1269,6 +1269,7 @@ pub enum Statement {
         cascade: bool,
         /// Whether `RESTRICT` was specified. This will be `false` when
         /// `CASCADE` or no drop behavior at all was specified.
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
         restrict: bool,
         /// Hive allows you specify whether the table's stored data will be
         /// deleted along with the dropped table
@@ -1562,6 +1563,7 @@ pub enum Statement {
         table_flag: Option<ObjectName>,
         // Table name
         table_name: ObjectName,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
         has_as: bool,
         // Table confs
         options: Vec<SqlOption>,
@@ -1572,6 +1574,7 @@ pub enum Statement {
     UNCache {
         // Table name
         table_name: ObjectName,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
         if_exists: bool,
     },
 }
@@ -3518,6 +3521,7 @@ impl fmt::Display for DiscardObject {
 /// Optional context modifier for statements that can be or `LOCAL`, or `SESSION`.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum ContextModifier {
     /// No context defined. Each dialect defines the default in this scenario.
     None,

From 12adafc2dbf4c320fe02f19e46199cd69ea19062 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Sun, 23 Oct 2022 01:05:22 +0200
Subject: [PATCH 11/13] add ast visiting macros

---
 src/ast/data_type.rs | 5 ++++-
 src/ast/ddl.rs       | 2 ++
 src/ast/mod.rs       | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
index 1d0725fcb..d7640a777 100644
--- a/src/ast/data_type.rs
+++ b/src/ast/data_type.rs
@@ -133,7 +133,10 @@ pub enum DataType {
     /// Bytea
     Bytea,
     /// Custom type such as enums
-    Custom(ObjectName, Vec<String>),
+    Custom(
+        ObjectName,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] Vec<String>,
+    ),
     /// Arrays
     Array(Box<DataType>),
     /// Enums
diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
index 1d8a4609f..4a9ac6538 100644
--- a/src/ast/ddl.rs
+++ b/src/ast/ddl.rs
@@ -268,6 +268,7 @@ pub enum TableConstraint {
     /// [1]: https://dev.mysql.com/doc/refman/8.0/en/create-table.html
     Index {
         /// Whether this index starts with KEY (true) or INDEX (false), to maintain the same syntax.
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
         display_as_key: bool,
         /// Index name.
         name: Option<Ident>,
@@ -352,6 +353,7 @@ impl fmt::Display for TableConstraint {
 /// [3]: https://www.postgresql.org/docs/14/sql-createindex.html
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum IndexType {
     BTree,
     Hash,
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index f67aa6825..4a9d7e074 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -1580,7 +1580,9 @@ pub enum Statement {
     ///CreateSequence -- define a new sequence
     /// CREATE [ { TEMPORARY | TEMP } ] SEQUENCE [ IF NOT EXISTS ] <sequence_name>
     CreateSequence {
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
         temporary: bool,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
         if_not_exists: bool,
         name: ObjectName,
     },

From 1c20fc151a8fff3c956a9c958bec2a75cda0025a Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Sat, 12 Nov 2022 13:19:33 +0100
Subject: [PATCH 12/13] update ast visiting macros

---
 src/ast/ddl.rs   |  2 ++
 src/ast/mod.rs   | 12 +++++++++---
 src/ast/query.rs |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
index 7ea7ce403..1dcec27c3 100644
--- a/src/ast/ddl.rs
+++ b/src/ast/ddl.rs
@@ -298,6 +298,7 @@ pub enum TableConstraint {
     /// [1]: https://dev.mysql.com/doc/refman/8.0/en/fulltext-natural-language.html
     FulltextOrSpatial {
         /// Whether this is a `FULLTEXT` (true) or `SPATIAL` (false) definition.
+        #[cfg_attr(feature = "derive-visitor", drive(skip))]
         fulltext: bool,
         /// Whether the type is followed by the keyword `KEY`, `INDEX`, or no keyword at all.
         index_type_display: KeyOrIndexDisplay,
@@ -403,6 +404,7 @@ impl fmt::Display for TableConstraint {
 /// [1]: https://dev.mysql.com/doc/refman/8.0/en/create-table.html
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum KeyOrIndexDisplay {
     /// Nothing to display
     None,
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index e6c4b0e3d..b3c6a0129 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -2674,17 +2674,18 @@ impl fmt::Display for Statement {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 /// Can use to describe options in create sequence or table column type identity
 /// [ INCREMENT [ BY ] increment ]
 ///     [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]
 ///     [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]
 pub enum SequenceOptions {
-    IncrementBy(Expr, bool),
+    IncrementBy(Expr, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     MinValue(MinMaxValue),
     MaxValue(MinMaxValue),
-    StartWith(Expr, bool),
+    StartWith(Expr, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
     Cache(Expr),
-    Cycle(bool),
+    Cycle(#[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
 }
 
 impl fmt::Display for SequenceOptions {
@@ -2765,12 +2766,14 @@ pub enum OnInsert {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct OnConflict {
     pub conflict_target: Vec<Ident>,
     pub action: OnConflictAction,
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum OnConflictAction {
     DoNothing,
     DoUpdate(Vec<Assignment>),
@@ -3244,11 +3247,14 @@ impl fmt::Display for ListAggOnOverflow {
 /// ORDER BY position is defined differently for BigQuery, Postgres and Snowflake.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub struct ArrayAgg {
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
     pub distinct: bool,
     pub expr: Box<Expr>,
     pub order_by: Option<Box<OrderByExpr>>,
     pub limit: Option<Box<Expr>>,
+    #[cfg_attr(feature = "derive-visitor", drive(skip))]
     pub within_group: bool, // order by is used inside a within group or not
 }
 
diff --git a/src/ast/query.rs b/src/ast/query.rs
index 06f148b2c..fe6d57ff0 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -143,6 +143,7 @@ impl fmt::Display for SetOperator {
 // For example, BigQuery does not support `DISTINCT` for `EXCEPT` and `INTERSECT`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "derive-visitor", derive(Drive, DriveMut))]
 pub enum SetQuantifier {
     All,
     Distinct,

From d55be7106cb407b687d430e50e368c07dedd11b8 Mon Sep 17 00:00:00 2001
From: lovasoa <pere.jobs@gmail.com>
Date: Sun, 13 Nov 2022 01:19:28 +0100
Subject: [PATCH 13/13] fmt

---
 src/ast/data_type.rs |  8 ++++----
 src/ast/mod.rs       | 12 +++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
index 24fa6af67..4aa090e66 100644
--- a/src/ast/data_type.rs
+++ b/src/ast/data_type.rs
@@ -130,8 +130,8 @@ pub enum DataType {
     ///
     /// [1]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#datetime-type
     Time(
-      #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>,
-      #[cfg_attr(feature = "derive-visitor", drive(skip))] TimezoneInfo
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] TimezoneInfo,
     ),
     /// Datetime with optional time precision e.g. [MySQL][1].
     ///
@@ -141,8 +141,8 @@ pub enum DataType {
     ///
     /// [1]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#datetime-type
     Timestamp(
-      #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>, 
-      #[cfg_attr(feature = "derive-visitor", drive(skip))] TimezoneInfo
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] Option<u64>,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] TimezoneInfo,
     ),
     /// Interval
     Interval,
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index b3c6a0129..5627ce712 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -36,12 +36,12 @@ pub use self::query::{
     TableAlias, TableFactor, TableWithJoins, Top, Values, With,
 };
 
+pub use self::value::{escape_quoted_string, DateTimeField, TrimWhereField, Value};
 #[cfg(feature = "derive-visitor")]
 pub use derive_visitor::{
     visitor_enter_fn, visitor_enter_fn_mut, visitor_fn, visitor_fn_mut, Drive, DriveMut,
     Event as VisitorEvent, Visitor, VisitorMut,
 };
-pub use self::value::{escape_quoted_string, DateTimeField, TrimWhereField, Value};
 
 mod data_type;
 mod ddl;
@@ -2680,10 +2680,16 @@ impl fmt::Display for Statement {
 ///     [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]
 ///     [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]
 pub enum SequenceOptions {
-    IncrementBy(Expr, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
+    IncrementBy(
+        Expr,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] bool,
+    ),
     MinValue(MinMaxValue),
     MaxValue(MinMaxValue),
-    StartWith(Expr, #[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
+    StartWith(
+        Expr,
+        #[cfg_attr(feature = "derive-visitor", drive(skip))] bool,
+    ),
     Cache(Expr),
     Cycle(#[cfg_attr(feature = "derive-visitor", drive(skip))] bool),
 }