[#68] AST predule 제거

myyrakle · Mar 16, 2024 · 4ccb05d · 4ccb05d
1 parent b81cac0
commit 4ccb05d
Show file tree

Hide file tree

Showing 78 changed files with 140 additions and 146 deletions.
diff --git a/src/ast/ddl/alter_database.rs b/src/ast/ddl/alter_database.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{DDLStatement, SQLStatement};
+use crate::ast::{DDLStatement, SQLStatement};
 
 /*
 ALTER DATABASE database_name

diff --git a/src/ast/ddl/alter_table.rs b/src/ast/ddl/alter_table.rs
@@ -1,5 +1,8 @@
 //use crate::ast::enums::SQLStatement;
-use crate::ast::predule::{Column, DataType, SQLExpression, SQLStatement, TableName};
+use crate::ast::{
+    types::{Column, DataType, SQLExpression, TableName},
+    SQLStatement,
+};
 
 use super::drop_database::DDLStatement;
 

diff --git a/src/ast/ddl/create_database.rs b/src/ast/ddl/create_database.rs
@@ -1,4 +1,4 @@
-pub use crate::ast::predule::{Column, DDLStatement, SQLStatement};
+pub use crate::ast::{DDLStatement, SQLStatement};
 
 /*
 CREATE DATABASE [IF NOT EXISTS] database_name;

diff --git a/src/ast/ddl/create_index.rs b/src/ast/ddl/create_index.rs
@@ -1,4 +1,7 @@
-use crate::ast::predule::{Column, DDLStatement, SQLStatement, TableName};
+use crate::ast::{
+    types::{Column, TableName},
+    DDLStatement, SQLStatement,
+};
 
 /*
 CREATE [ UNIQUE ] INDEX [ IF NOT EXISTS ] name ON table_name

diff --git a/src/ast/ddl/create_table.rs b/src/ast/ddl/create_table.rs
@@ -1,5 +1,6 @@
-use crate::ast::predule::{
-    Column, DDLStatement, ForeignKey, SQLStatement, TableName, TableOptions, UniqueKey,
+use crate::ast::{
+    types::{Column, ForeignKey, TableName, TableOptions, UniqueKey},
+    DDLStatement, SQLStatement,
 };
 
 /*

diff --git a/src/ast/ddl/drop_database.rs b/src/ast/ddl/drop_database.rs
@@ -1,4 +1,4 @@
-pub use crate::ast::predule::{Column, DDLStatement, SQLStatement};
+pub use crate::ast::{DDLStatement, SQLStatement};
 
 /*
 DROP DATABASE [IF EXISTS] database_name;

diff --git a/src/ast/ddl/drop_table.rs b/src/ast/ddl/drop_table.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{DDLStatement, SQLStatement, TableName};
+use crate::ast::{types::TableName, DDLStatement, SQLStatement};
 
 /*
 DROP TABLE [IF EXISTS] [database_name.]table_name;

diff --git a/src/ast/dml/delete.rs b/src/ast/dml/delete.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{DMLStatement, SQLStatement, TableName};
+use crate::ast::{types::TableName, DMLStatement, SQLStatement};
 
 use super::parts::{_where::WhereClause, target::UpdateTarget};
 

diff --git a/src/ast/dml/expressions/between.rs b/src/ast/dml/expressions/between.rs
@@ -1,6 +1,6 @@
 use std::ops::Not;
 
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 use serde::{Deserialize, Serialize};
 
 use super::not_between::NotBetweenExpression;

diff --git a/src/ast/dml/expressions/binary.rs b/src/ast/dml/expressions/binary.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 use serde::{Deserialize, Serialize};
 
 use super::operators::BinaryOperator;

diff --git a/src/ast/dml/expressions/call.rs b/src/ast/dml/expressions/call.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{Function, SQLExpression};
+use crate::ast::types::{Function, SQLExpression};
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/expressions/list.rs b/src/ast/dml/expressions/list.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/expressions/not_between.rs b/src/ast/dml/expressions/not_between.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/expressions/parentheses.rs b/src/ast/dml/expressions/parentheses.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/expressions/subquery.rs b/src/ast/dml/expressions/subquery.rs
@@ -1,4 +1,4 @@
-use crate::ast::{dml::select::SelectQuery, predule::SQLExpression};
+use crate::ast::{dml::select::SelectQuery, types::SQLExpression};
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/expressions/unary.rs b/src/ast/dml/expressions/unary.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 use serde::{Deserialize, Serialize};
 
 use super::operators::UnaryOperator;

diff --git a/src/ast/dml/insert.rs b/src/ast/dml/insert.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{DMLStatement, SQLStatement, TableName};
+use crate::ast::{types::TableName, DMLStatement, SQLStatement};
 
 use super::{parts::insert_values::InsertValue, select::SelectQuery};
 

diff --git a/src/ast/dml/parts/from.rs b/src/ast/dml/parts/from.rs
@@ -1,4 +1,4 @@
-use crate::ast::{dml::expressions::subquery::SubqueryExpression, predule::TableName};
+use crate::ast::{dml::expressions::subquery::SubqueryExpression, types::TableName};
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/parts/group_by.rs b/src/ast/dml/parts/group_by.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SelectColumn;
+use crate::ast::types::SelectColumn;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/parts/having.rs b/src/ast/dml/parts/having.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/parts/insert_values.rs b/src/ast/dml/parts/insert_values.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct InsertValue {

diff --git a/src/ast/dml/parts/join.rs b/src/ast/dml/parts/join.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{SQLExpression, TableName};
+use crate::ast::types::{SQLExpression, TableName};
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/parts/order_by.rs b/src/ast/dml/parts/order_by.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/parts/select_item.rs b/src/ast/dml/parts/select_item.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/parts/target.rs b/src/ast/dml/parts/target.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::TableName;
+use crate::ast::types::TableName;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/parts/update_item.rs b/src/ast/dml/parts/update_item.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct UpdateItem {

diff --git a/src/ast/dml/parts/where.rs b/src/ast/dml/parts/where.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/ast/dml/plan/delete/from.rs b/src/ast/dml/plan/delete/from.rs
@@ -1,4 +1,4 @@
-use crate::ast::{dml::plan::select::scan::ScanType, predule::TableName};
+use crate::ast::{dml::plan::select::scan::ScanType, types::TableName};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct DeleteFromPlan {

diff --git a/src/ast/dml/plan/select/filter.rs b/src/ast/dml/plan/select/filter.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct FilterPlan {

diff --git a/src/ast/dml/plan/select/from.rs b/src/ast/dml/plan/select/from.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::TableName;
+use crate::ast::types::TableName;
 
 use super::scan::ScanType;
 

diff --git a/src/ast/dml/plan/select/join.rs b/src/ast/dml/plan/select/join.rs
@@ -1,6 +1,6 @@
 use crate::ast::{
     dml::parts::join::JoinType,
-    predule::{Index, SQLExpression, TableName},
+    types::{Index, SQLExpression, TableName},
 };
 
 #[derive(Clone, Debug, PartialEq)]

diff --git a/src/ast/dml/plan/select/scan.rs b/src/ast/dml/plan/select/scan.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::Index;
+use crate::ast::types::Index;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum ScanType {

diff --git a/src/ast/dml/plan/select/subquery.rs b/src/ast/dml/plan/select/subquery.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{Index, SQLExpression, TableName};
+use crate::ast::types::{Index, SQLExpression, TableName};
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct SelectSubqueryPlan {

diff --git a/src/ast/dml/plan/update/from.rs b/src/ast/dml/plan/update/from.rs
@@ -1,4 +1,4 @@
-use crate::ast::{dml::plan::select::scan::ScanType, predule::TableName};
+use crate::ast::{dml::plan::select::scan::ScanType, types::TableName};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UpdateFromPlan {

diff --git a/src/ast/dml/select.rs b/src/ast/dml/select.rs
@@ -2,7 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::ast::{
     ddl::drop_database::SQLStatement,
-    predule::{DMLStatement, SQLExpression, SelectColumn, TableName},
+    types::{SQLExpression, SelectColumn, TableName},
+    DMLStatement,
 };
 
 use super::{

diff --git a/src/ast/dml/update.rs b/src/ast/dml/update.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{DMLStatement, SQLStatement, TableName};
+use crate::ast::{types::TableName, DMLStatement, SQLStatement};
 
 use super::parts::{_where::WhereClause, target::UpdateTarget, update_item::UpdateItem};
 

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
@@ -3,5 +3,56 @@ pub mod dcl;
 pub mod ddl;
 pub mod dml;
 pub mod other;
-pub mod predule;
 pub mod types;
+
+use crate::ast::{
+    ddl::{
+        alter_database::AlterDatabaseQuery, alter_table::AlterTableQuery,
+        create_database::CreateDatabaseQuery, create_index::CreateIndexQuery,
+        create_table::CreateTableQuery, drop_database::DropDatabaseQuery,
+        drop_table::DropTableQuery,
+    },
+    dml::{delete::DeleteQuery, insert::InsertQuery, select::SelectQuery, update::UpdateQuery},
+    other::{
+        desc_table::DescTableQuery, show_databases::ShowDatabasesQuery,
+        show_tables::ShowTablesQuery, use_database::UseDatabaseQuery,
+    },
+};
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum SQLStatement {
+    DDL(DDLStatement),
+    DML(DMLStatement),
+    DCL(DCLStatement),
+    Other(OtherStatement),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum DDLStatement {
+    CreateDatabaseQuery(CreateDatabaseQuery),
+    AlterDatabase(AlterDatabaseQuery),
+    DropDatabaseQuery(DropDatabaseQuery),
+    CreateTableQuery(CreateTableQuery),
+    AlterTableQuery(AlterTableQuery),
+    DropTableQuery(DropTableQuery),
+    CreateIndexQuery(CreateIndexQuery),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum DMLStatement {
+    InsertQuery(InsertQuery),
+    UpdateQuery(UpdateQuery),
+    DeleteQuery(DeleteQuery),
+    SelectQuery(SelectQuery),
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum DCLStatement {}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum OtherStatement {
+    ShowDatabases(ShowDatabasesQuery),
+    UseDatabase(UseDatabaseQuery),
+    ShowTables(ShowTablesQuery),
+    DescTable(DescTableQuery),
+}
diff --git a/src/ast/other/desc_table.rs b/src/ast/other/desc_table.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{OtherStatement, SQLStatement, TableName};
+use crate::ast::{types::TableName, OtherStatement, SQLStatement};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct DescTableQuery {

diff --git a/src/ast/other/show_databases.rs b/src/ast/other/show_databases.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{OtherStatement, SQLStatement};
+use crate::ast::{OtherStatement, SQLStatement};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ShowDatabasesQuery {}

diff --git a/src/ast/other/show_tables.rs b/src/ast/other/show_tables.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{OtherStatement, SQLStatement};
+use crate::ast::{OtherStatement, SQLStatement};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ShowTablesQuery {

diff --git a/src/ast/other/use_database.rs b/src/ast/other/use_database.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::{OtherStatement, SQLStatement};
+use crate::ast::{OtherStatement, SQLStatement};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UseDatabaseQuery {

diff --git a/src/ast/predule.rs b/src/ast/predule.rs
diff --git a/src/ast/types/column.rs b/src/ast/types/column.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::DataType;
+use crate::ast::types::DataType;
 use serde::{Deserialize, Serialize};
 
 use super::expression::SQLExpression;

diff --git a/src/ast/types/foreign_key.rs b/src/ast/types/foreign_key.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::TableName;
+use crate::ast::types::TableName;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq)]

diff --git a/src/ast/types/mod.rs b/src/ast/types/mod.rs
@@ -22,9 +22,6 @@ pub use select_column::*;
 pub mod function;
 pub use function::*;
 
-pub mod statement;
-pub use statement::*;
-
 pub mod expression;
 pub use expression::*;
 

diff --git a/src/ast/types/select_column.rs b/src/ast/types/select_column.rs
@@ -1,4 +1,4 @@
-use crate::ast::predule::SQLExpression;
+use crate::ast::types::SQLExpression;
 use serde::{Deserialize, Serialize};
 
 // [table_alias.]column_name