sql_parser: select statement parser refactoring(4)

Author: Almaz-KG

src/parser/select/from/function.rs

@@ -0,0 +1 @@
+

src/parser/select/select_from.rs src/parser/select/from/mod.rs

@@ -1,9 +1,12 @@
+mod function;
+mod subquery;
+
 use crate::parser::{ExpressionParser, IdentifierParser, ParsingError};
 use crate::{
     FromClause, JoinClause, JoinConstraint, JoinTable, JoinType, Keyword, Parser, TokenType,
 };
 
-pub use super::select_from_subquery::SelectFromSubqueryParser;
+pub use subquery::SelectFromSubqueryParser;
 
 pub trait SelectFromParser {
     fn parse_from_clause(&mut self) -> Result<Option<FromClause>, ParsingError>;

src/parser/select/select_from_subquery.rs src/parser/select/from/subquery.rs

@@ -1,11 +1,11 @@
+use super::SelectFromParser;
+use crate::parser::select::SelectStatementParser;
 use crate::{
     parser::{ExpressionParser, IdentifierParser, ParsingError},
     FromClause, Keyword, Parser, QualifiedTableName, SelectFromFunction, SelectFromSubquery,
     TokenType,
 };
 
-use super::{SelectFromParser, SelectStatementParser};
-
 pub trait SelectFromSubqueryParser {
     fn parse_from_clause_subquery(&mut self) -> Result<FromClause, ParsingError>;
 }
@@ -75,7 +75,7 @@ impl<'a> SelectFromSubqueryParser for Parser<'a> {
 
 #[cfg(test)]
 mod test_select_from_subquery {
-    use crate::parser::select::select_from::test_utils::*;
+    use crate::parser::select::from::test_utils::*;
     use crate::parser::test_utils::*;
     use crate::{Identifier, QualifiedTableName, SelectFromSubquery, Statement};
 

src/parser/select/mod.rs

@@ -1,6 +1,5 @@
+mod from;
 mod select_columns;
-mod select_from;
-mod select_from_subquery;
 mod values;
 
 use crate::ast::{
@@ -15,9 +14,9 @@ use super::Parser;
 use crate::ast::{Select, SelectStatement};
 use crate::parser::errors::ParsingError;
 
+pub use from::*;
 pub use select_columns::SelectColumnsParser;
-pub use select_from::SelectFromParser;
-pub use values::ValuesStatementParser;
+use values::ValuesStatementParser;
 
 /// Trait for parsing SELECT statements
 /// The SELECT statement documentation can be found here: