Merge pull request #5000 from andylokandy/refactor

chore(parser): rearrange file structure of common_ast

Author: BohuTANG

common/ast/src/parser/ast/expression.rs renamed to common/ast/src/ast/expr.rs

@@ -17,9 +17,9 @@ use std::fmt::Formatter;
 
 use sqlparser::ast::Value;
 
-use super::Identifier;
-use super::Query;
-use crate::parser::ast::display_identifier_vec;
+use crate::ast::display_identifier_vec;
+use crate::ast::Identifier;
+use crate::ast::Query;
 
 #[derive(Debug, Clone, PartialEq)]
 #[allow(dead_code)]

common/ast/src/parser/ast/mod.rs renamed to common/ast/src/ast/mod.rs

@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod ast_visitor;
-mod expression;
+mod expr;
 mod query;
 mod statement;
 
 use std::fmt::Display;
 use std::fmt::Formatter;
 
-pub use expression::*;
+pub use expr::*;
 pub use query::*;
 pub use statement::*;
 

common/ast/src/parser/ast/query.rs renamed to common/ast/src/ast/query.rs

@@ -15,9 +15,9 @@
 use std::fmt::Display;
 use std::fmt::Formatter;
 
-use crate::parser::ast::display_identifier_vec;
-use crate::parser::ast::Expr;
-use crate::parser::ast::Identifier;
+use crate::ast::display_identifier_vec;
+use crate::ast::Expr;
+use crate::ast::Identifier;
 
 // Root node of a query tree
 #[derive(Debug, Clone, PartialEq)]

common/ast/src/parser/ast/statement.rs renamed to common/ast/src/ast/statement.rs

@@ -15,11 +15,11 @@
 use std::fmt::Display;
 use std::fmt::Formatter;
 
-use super::expression::Literal;
-use super::expression::TypeName;
-use super::Identifier;
-use crate::parser::ast::display_identifier_vec;
-use crate::parser::ast::query::Query;
+use crate::ast::display_identifier_vec;
+use crate::ast::expr::Literal;
+use crate::ast::expr::TypeName;
+use crate::ast::Identifier;
+use crate::ast::Query;
 
 // SQL statement
 #[derive(Debug, Clone, PartialEq)]

common/ast/src/lib.rs

@@ -12,5 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod ast;
 pub mod parser;
 pub mod udfs;