sql_parser: expression parser refactoring (7)

Author: Almaz-KG

src/parser/alter/mod.rs

@@ -1,6 +1,6 @@
 use crate::column::ColumnDefinitionParser;
-use crate::expression::IdentifierParser;
 use crate::parser::errors::ParsingError;
+use crate::IdentifierParser;
 use crate::{AlterTableStatement, AlterTableStatementType, Identifier, Keyword, Parser};
 
 pub trait AlterTableStatementParser {

src/parser/column/mod.rs

@@ -1,10 +1,10 @@
 use crate::{
-    ColumnConstraint, ColumnConstraintType, ColumnDefinition, ConflictClause, Expression, FKAction,
-    FKConstraintAction, FKDeferrableType, ForeignKeyClause, GeneratedColumnConstraint,
-    GeneratedColumnType, Identifier, Keyword, LiteralValue, PrimaryKeyConstraint, TokenType,
+    expression::ExpressionParser, ColumnConstraint, ColumnConstraintType, ColumnDefinition,
+    ConflictClause, DataTypeParser, Expression, FKAction, FKConstraintAction, FKDeferrableType,
+    ForeignKeyClause, GeneratedColumnConstraint, GeneratedColumnType, Identifier, IdentifierParser,
+    Keyword, LiteralValue, PrimaryKeyConstraint, TokenType,
 };
 
-use super::expression::{DataTypeParser, ExpressionParser, IdentifierParser};
 use super::{Parser, ParsingError};
 
 pub trait ColumnDefinitionParser {

src/parser/create/create_index.rs

@@ -1,8 +1,7 @@
 use crate::parser::errors::ParsingError;
 use crate::{
-    expression::IdentifierParser,
     parser::{insert::InsertStatementParser, select::SelectStatementParser},
-    CreateIndexStatement, Keyword, Parser,
+    CreateIndexStatement, IdentifierParser, Keyword, Parser,
 };
 
 use super::CreateStatementParser;

src/parser/create/create_table.rs

@@ -3,9 +3,9 @@ use crate::parser::{
     column::ColumnDefinitionParser, insert::InsertStatementParser, select::SelectStatementParser,
 };
 use crate::{
-    expression::{ExpressionParser, IdentifierParser},
-    ColumnDefinition, CreateTableColumnDef, CreateTableOption, CreateTableStatement, Keyword,
-    Parser, TableConstraint, TableConstraintType, TableOption, TokenType,
+    expression::ExpressionParser, ColumnDefinition, CreateTableColumnDef, CreateTableOption,
+    CreateTableStatement, IdentifierParser, Keyword, Parser, TableConstraint, TableConstraintType,
+    TableOption, TokenType,
 };
 
 use super::CreateStatementParser;

src/parser/create/create_trigger.rs

@@ -1,9 +1,8 @@
 use super::CreateStatementParser;
-use crate::expression::{ExpressionParser, IdentifierParser};
 use crate::parser::errors::ParsingError;
 use crate::{
-    CreateTriggerStatement, Expression, Keyword, Parser, TokenType, TriggerEvent, TriggerEventType,
-    TriggerPreCondition, TriggerStatement,
+    CreateTriggerStatement, Expression, ExpressionParser, IdentifierParser, Keyword, Parser,
+    TokenType, TriggerEvent, TriggerEventType, TriggerPreCondition, TriggerStatement,
 };
 
 pub trait CreateTriggerStatementParser {

src/parser/create/create_view.rs

@@ -1,9 +1,8 @@
 use super::CreateStatementParser;
-use crate::expression::IdentifierParser;
 use crate::parser::errors::ParsingError;
 use crate::{
     parser::{insert::InsertStatementParser, select::SelectStatementParser},
-    CreateViewStatement, Keyword, Parser,
+    CreateViewStatement, IdentifierParser, Keyword, Parser,
 };
 
 pub trait CreateViewStatementParser {

src/parser/create/create_virtual_table.rs

@@ -1,7 +1,9 @@
 use super::CreateStatementParser;
-use crate::expression::{ExpressionParser, IdentifierParser};
+use crate::expression::ExpressionParser;
 use crate::parser::errors::ParsingError;
-use crate::{CreateVirtualTableStatement, Expression, Keyword, Parser, TokenType};
+use crate::{
+    CreateVirtualTableStatement, Expression, IdentifierParser, Keyword, Parser, TokenType,
+};
 
 pub trait CreateVirtualTableStatementParser {
     fn parse_create_virtual_table_statement(

src/parser/cte/mod.rs

@@ -1,6 +1,6 @@
 use crate::{
-    expression::IdentifierParser, CteExpression, Identifier, Keyword, MaterializationType,
-    Statement, TokenType, WithCteStatement,
+    CteExpression, Identifier, IdentifierParser, Keyword, MaterializationType, Statement,
+    TokenType, WithCteStatement,
 };
 
 use super::{select::SelectStatementParser, Parser, ParsingError};

src/parser/expression/data_type.rs src/parser/data_type.rs

@@ -1,6 +1,5 @@
 use crate::{
-    expression::IdentifierParser, DeleteStatement, Keyword, QualifiedTableName, ReturningClause,
-    TokenType,
+    DeleteStatement, IdentifierParser, Keyword, QualifiedTableName, ReturningClause, TokenType,
 };
 
 use super::{expression::ExpressionParser, select::SelectStatementParser, Parser, ParsingError};

src/parser/delete/mod.rs

@@ -1,7 +1,7 @@
 use crate::parser::errors::ParsingError;
-use crate::{Expression, Keyword, Parser, TokenType};
+use crate::{DataTypeParser, Expression, Keyword, Parser, TokenType};
 
-use super::{data_type::DataTypeParser, ExpressionParser};
+use super::ExpressionParser;
 
 pub trait CastExpressionParser {
     fn parse_cast_expression(&mut self) -> Result<Expression, ParsingError>;

src/parser/expression/cast_expr.rs

@@ -2,10 +2,8 @@ mod between_expr;
 mod case_expr;
 mod cast_expr;
 mod collate_expr;
-mod data_type;
 mod exists_expr;
 mod function_expr;
-mod identifier;
 mod in_expr;
 mod is_expr;
 mod like_expr;
@@ -17,9 +15,7 @@ use crate::parser::errors::ParsingError;
 use crate::{Expression, Keyword, Parser, TokenType, UnaryMatchingExpression};
 use between_expr::BetweenExpressionParser;
 use collate_expr::CollateExpressionParser;
-pub use data_type::DataTypeParser;
-pub use function_expr::FunctionParser;
-pub use identifier::IdentifierParser;
+use function_expr::FunctionParser;
 use in_expr::InExpressionParser;
 use is_expr::IsExpressionParser;
 use like_expr::LikeExpressionParser;

src/parser/expression/mod.rs

@@ -1,10 +1,11 @@
 use super::{
     case_expr::CaseExpressionParser, cast_expr::CastExpressionParser,
     exists_expr::ExistsExpressionParser, precedence::get_precedence,
-    raise_expr::RaiseExpressionParser, ExpressionParser, FunctionParser, IdentifierParser,
+    raise_expr::RaiseExpressionParser, ExpressionParser, FunctionParser,
 };
 use crate::{
-    parser::ParsingError, BinaryOp, Expression, Keyword, LiteralValue, Parser, TokenType, UnaryOp,
+    parser::ParsingError, BinaryOp, Expression, IdentifierParser, Keyword, LiteralValue, Parser,
+    TokenType, UnaryOp,
 };
 
 pub trait PrattParser {

src/parser/expression/pratt_parser.rs

@@ -5,10 +5,8 @@ use crate::{
 };
 
 use super::{
-    delete::DeleteStatementParser,
-    expression::{ExpressionParser, IdentifierParser},
-    update::UpdateStatementParser,
-    Parser, ParsingError,
+    delete::DeleteStatementParser, expression::ExpressionParser, update::UpdateStatementParser,
+    IdentifierParser, Parser, ParsingError,
 };
 
 pub trait InsertStatementParser {

src/parser/expression/identifier.rs src/parser/identifier.rs

@@ -4,11 +4,14 @@ pub mod alter;
 pub mod column;
 pub mod create;
 pub mod cte;
+mod data_type;
 pub mod delete;
 pub mod drop;
 pub mod errors;
 pub mod explain;
 pub mod expression;
+mod identifier;
+
 pub mod insert;
 pub mod select;
 pub mod sqlite;
@@ -23,14 +26,17 @@ use delete::*;
 use drop::*;
 use errors::*;
 use explain::*;
-use expression::*;
 use insert::*;
 use select::*;
 use sqlite::*;
 use trx::*;
 use update::*;
 use window::*;
 
+pub use data_type::DataTypeParser;
+pub use expression::ExpressionParser;
+pub use identifier::IdentifierParser;
+
 use crate::ast::{IndexedType, LimitClause, OrderingTerm, Statement};
 use crate::{Keyword, Ordering, Token, TokenType, Tokenizer};
 

src/parser/insert/mod.rs

@@ -1,6 +1,6 @@
-use crate::expression::{ExpressionParser, IdentifierParser};
+use crate::expression::ExpressionParser;
 use crate::parser::errors::ParsingError;
-use crate::{AttachStatement, DetachStatement, Keyword, Parser, Statement};
+use crate::{AttachStatement, DetachStatement, IdentifierParser, Keyword, Parser, Statement};
 
 use super::sqlite3_name::SQLite3NameParser;
 

src/parser/mod.rs

@@ -1,10 +1,8 @@
 use crate::{ConflictClause, Keyword, SetClause, TokenType, UpdateStatement};
 
 use super::{
-    delete::DeleteStatementParser,
-    expression::{ExpressionParser, IdentifierParser},
-    select::SelectStatementParser,
-    Parser, ParsingError, SelectFromParser,
+    delete::DeleteStatementParser, select::SelectStatementParser, ExpressionParser,
+    IdentifierParser, Parser, ParsingError, SelectFromParser,
 };
 
 pub trait UpdateStatementParser {