chore(query): bump ast 0.1.3 (#17145)

* chore(query): add bump ast 0.1.0 * chore(query): add bump ast 0.1.0 * chore(query): add bump ast 0.1.0 * chore(query): add bump ast 0.1.0 * chore(query): add bump ast 0.1.1 * chore(query): add bump ast 0.1.1 * chore(query): add bump ast 0.1.2 * chore(query): add bump ast 0.1.3 * chore(query): add bump ast 0.1.0 * update * update * update * chore(cli): fix tests * chore(cli): fix tests * chore(cli): fix tests
databendlabs · Jan 1, 2025 · 0984b3f · 0984b3f
1 parent ddb5c7d
commit 0984b3f
Show file tree

Hide file tree

Showing 33 changed files with 656 additions and 2,508 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/query/ast/Cargo.toml b/src/query/ast/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "databend-common-ast"
-version = "0.0.4"
+version = "0.1.3"
 publish = true
 description = "SQL parser for Databend"
 authors = { workspace = true }
@@ -25,7 +25,6 @@ nom-rule = { workspace = true }
 ordered-float = { workspace = true }
 percent-encoding = { workspace = true }
 pratt = { workspace = true }
-pretty = { workspace = true }
 pretty_assertions = { workspace = true }
 recursive = { workspace = true }
 rspack-codespan-reporting = { workspace = true }

diff --git a/src/query/ast/README.md b/src/query/ast/README.md
@@ -0,0 +1,3 @@
+# databend-common-ast
+
+`databend-common-ast` is a module of the Databend project. It provides the Abstract Syntax Tree (AST) used for parsing and interpreting SQL queries.
diff --git a/src/query/ast/src/ast/expr.rs b/src/query/ast/src/ast/expr.rs
@@ -1241,27 +1241,42 @@ pub struct WindowSpec {
 impl Display for WindowSpec {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
         write!(f, "(")?;
+
+        let mut write = false;
+
         if let Some(existing_window_name) = &self.existing_window_name {
-            write!(f, " {existing_window_name}")?;
+            write!(f, "{existing_window_name}")?;
+            write = true;
         }
 
         if !self.partition_by.is_empty() {
-            write!(f, " PARTITION BY ")?;
+            if write {
+                write!(f, " ")?;
+            }
+            write = true;
+            write!(f, "PARTITION BY ")?;
             write_comma_separated_list(f, &self.partition_by)?;
         }
 
         if !self.order_by.is_empty() {
-            write!(f, " ORDER BY ")?;
+            if write {
+                write!(f, " ")?;
+            }
+            write = true;
+            write!(f, "ORDER BY ")?;
             write_comma_separated_list(f, &self.order_by)?;
         }
 
         if let Some(frame) = &self.window_frame {
+            if write {
+                write!(f, " ")?;
+            }
             match frame.units {
                 WindowFrameUnits::Rows => {
-                    write!(f, " ROWS")?;
+                    write!(f, "ROWS")?;
                 }
                 WindowFrameUnits::Range => {
-                    write!(f, " RANGE")?;
+                    write!(f, "RANGE")?;
                 }
             }
 
@@ -1281,7 +1296,7 @@ impl Display for WindowSpec {
                 format_frame(&frame.end_bound)
             )?
         }
-        write!(f, " )")?;
+        write!(f, ")")?;
         Ok(())
     }
 }
@@ -1868,10 +1883,10 @@ impl ExprReplacer {
                             self.replace_expr(expr);
                         }
                         SelectTarget::StarColumns { column_filter, .. } => {
-                            if let Some(column_filter) = column_filter
-                                && let ColumnFilter::Lambda(lambda) = column_filter
-                            {
-                                self.replace_expr(&mut lambda.expr);
+                            if let Some(column_filter) = column_filter {
+                                if let ColumnFilter::Lambda(lambda) = column_filter {
+                                    self.replace_expr(&mut lambda.expr);
+                                }
                             }
                         }
                     }
@@ -2006,10 +2021,10 @@ impl ExprReplacer {
                 }
             }
             Expr::CountAll { window, .. } => {
-                if let Some(window) = window
-                    && let Window::WindowSpec(window_spec) = window
-                {
-                    self.replace_window_spec(window_spec);
+                if let Some(window) = window {
+                    if let Window::WindowSpec(window_spec) = window {
+                        self.replace_window_spec(window_spec);
+                    }
                 }
             }
             Expr::Tuple { exprs, .. } => {
@@ -2024,10 +2039,10 @@ impl ExprReplacer {
                 for param in func.params.iter_mut() {
                     self.replace_expr(param);
                 }
-                if let Some(window_desc) = &mut func.window
-                    && let Window::WindowSpec(window_spec) = &mut window_desc.window
-                {
-                    self.replace_window_spec(window_spec);
+                if let Some(window_desc) = &mut func.window {
+                    if let Window::WindowSpec(window_spec) = &mut window_desc.window {
+                        self.replace_window_spec(window_spec);
+                    }
                 }
                 if let Some(lambda) = &mut func.lambda {
                     self.replace_expr(&mut lambda.expr);

diff --git a/src/query/ast/src/ast/format/mod.rs b/src/query/ast/src/ast/format/mod.rs
@@ -14,12 +14,9 @@
 
 mod indent_format;
 mod pretty_format;
-mod syntax;
 
 use std::fmt::Display;
 
-pub use syntax::pretty_statement;
-
 #[derive(Clone)]
 pub struct FormatTreeNode<T: Display + Clone = String> {
     pub payload: T,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# databend-common-ast

		`databend-common-ast` is a module of the Databend project. It provides the Abstract Syntax Tree (AST) used for parsing and interpreting SQL queries.