chore(ast): unify all of {escape,unescape,quote,unquote}_{string/at_string/ident} (#15548)

* chore(ast): unify all of {escape,unescape,quote,unquote}_{string/at_string/ident}

* fix

* fix

Author: andylokandy

src/query/ast/src/ast/common.rs

@@ -19,7 +19,7 @@ use databend_common_exception::Span;
 use derive_visitor::Drive;
 use derive_visitor::DriveMut;
 
-use crate::parser::quote::quote_ident;
+use crate::ast::quote::QuotedIdent;
 
 // Identifier of table name or column name.
 #[derive(Debug, Clone, PartialEq, Eq, Drive, DriveMut)]
@@ -62,9 +62,8 @@ impl Display for Identifier {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
         if self.is_hole {
             write!(f, "IDENTIFIER(:{})", self.name)
-        } else if let Some(c) = self.quote {
-            let quoted = quote_ident(&self.name, c, true);
-            write!(f, "{}", quoted)
+        } else if let Some(quote) = self.quote {
+            write!(f, "{}", QuotedIdent(&self.name, quote))
         } else {
             write!(f, "{}", self.name)
         }

src/query/ast/src/ast/escape.rs

@@ -471,11 +471,11 @@ impl Display for Expr {
             min_precedence: Precedence,
             f: &mut Formatter,
         ) -> std::fmt::Result {
-            let precedence = expr.precedence();
-            let need_parentheses = precedence.map(|p| p < min_precedence).unwrap_or(false);
-            let inner_precedence = precedence.unwrap_or(Precedence(0));
+            let prec = expr.precedence();
+            let need_paren = prec.map(|p| p < min_precedence).unwrap_or(false);
+            let min_prec = prec.unwrap_or(Precedence(0));
 
-            if need_parentheses {
+            if need_paren {
                 write!(f, "(")?;
             }
 
@@ -488,7 +488,7 @@ impl Display for Expr {
                     }
                 }
                 Expr::IsNull { expr, not, .. } => {
-                    write_expr(expr, inner_precedence, f)?;
+                    write_expr(expr, min_prec, f)?;
                     write!(f, " IS")?;
                     if *not {
                         write!(f, " NOT")?;
@@ -498,19 +498,19 @@ impl Display for Expr {
                 Expr::IsDistinctFrom {
                     left, right, not, ..
                 } => {
-                    write_expr(left, inner_precedence, f)?;
+                    write_expr(left, min_prec, f)?;
                     write!(f, " IS")?;
                     if *not {
                         write!(f, " NOT")?;
                     }
                     write!(f, " DISTINCT FROM ")?;
-                    write_expr(right, inner_precedence, f)?;
+                    write_expr(right, min_prec, f)?;
                 }
 
                 Expr::InList {
                     expr, list, not, ..
                 } => {
-                    write_expr(expr, inner_precedence, f)?;
+                    write_expr(expr, min_prec, f)?;
                     if *not {
                         write!(f, " NOT")?;
                     }
@@ -524,7 +524,7 @@ impl Display for Expr {
                     not,
                     ..
                 } => {
-                    write_expr(expr, inner_precedence, f)?;
+                    write_expr(expr, min_prec, f)?;
                     if *not {
                         write!(f, " NOT")?;
                     }
@@ -537,7 +537,7 @@ impl Display for Expr {
                     not,
                     ..
                 } => {
-                    write_expr(expr, inner_precedence, f)?;
+                    write_expr(expr, min_prec, f)?;
                     if *not {
                         write!(f, " NOT")?;
                     }
@@ -547,28 +547,28 @@ impl Display for Expr {
                     match op {
                         // TODO (xieqijun) Maybe special attribute are provided to check whether the symbol is before or after.
                         UnaryOperator::Factorial => {
-                            write_expr(expr, inner_precedence, f)?;
+                            write_expr(expr, min_prec, f)?;
                             write!(f, " {op}")?;
                         }
                         _ => {
                             write!(f, "{op} ")?;
-                            write_expr(expr, inner_precedence, f)?;
+                            write_expr(expr, min_prec, f)?;
                         }
                     }
                 }
                 Expr::BinaryOp {
                     op, left, right, ..
                 } => {
-                    write_expr(left, inner_precedence, f)?;
+                    write_expr(left, min_prec, f)?;
                     write!(f, " {op} ")?;
-                    write_expr(right, inner_precedence, f)?;
+                    write_expr(right, min_prec, f)?;
                 }
                 Expr::JsonOp {
                     op, left, right, ..
                 } => {
-                    write_expr(left, inner_precedence, f)?;
+                    write_expr(left, min_prec, f)?;
                     write!(f, " {op} ")?;
-                    write_expr(right, inner_precedence, f)?;
+                    write_expr(right, min_prec, f)?;
                 }
                 Expr::Cast {
                     expr,
@@ -577,7 +577,7 @@ impl Display for Expr {
                     ..
                 } => {
                     if *pg_style {
-                        write_expr(expr, inner_precedence, f)?;
+                        write_expr(expr, min_prec, f)?;
                         write!(f, "::{target_type}")?;
                     } else {
                         write!(f, "CAST({expr} AS {target_type})")?;
@@ -680,7 +680,7 @@ impl Display for Expr {
                     write!(f, "({subquery})")?;
                 }
                 Expr::MapAccess { expr, accessor, .. } => {
-                    write_expr(expr, inner_precedence, f)?;
+                    write_expr(expr, min_prec, f)?;
                     match accessor {
                         MapAccessor::Bracket { key } => write!(f, "[{key}]")?,
                         MapAccessor::DotNumber { key } => write!(f, ".{key}")?,
@@ -729,7 +729,7 @@ impl Display for Expr {
                 }
             }
 
-            if need_parentheses {
+            if need_paren {
                 write!(f, ")")?;
             }
 

src/query/ast/src/ast/expr.rs

@@ -14,10 +14,10 @@
 
 #[allow(clippy::module_inception)]
 mod common;
-mod escape;
 mod expr;
 mod format;
 mod query;
+pub mod quote;
 mod statements;
 mod visitors;