sql_parser: select statement parser refactoring(8)

Author: Almaz-KG

src/parser/select/from/join.rs

@@ -360,3 +360,84 @@ mod select_from_with_join_clause_tests {
         );
     }
 }
+
+#[cfg(test)]
+mod select_from_comma_separated_entries {
+    use crate::parser::test_utils::*;
+    use crate::select::from::test_utils::select_from;
+    use crate::{
+        FromClause, Identifier, IndexedType, JoinClause, JoinTable, JoinType, QualifiedTableName,
+        SelectFromSubquery, Statement,
+    };
+
+    #[test]
+    fn test_select_from_comma_separated_table_or_subqueries() {
+        fn join(lhs: FromClause, rhs: FromClause) -> FromClause {
+            FromClause::Join(JoinClause {
+                lhs_table: Box::new(lhs),
+                join_tables: vec![JoinTable {
+                    join_type: JoinType::Cross,
+                    table: Box::new(rhs),
+                    constraints: None,
+                }],
+            })
+        }
+
+        let table_1 = FromClause::Table(QualifiedTableName::from(Identifier::Single(
+            "table_1".to_string(),
+        )));
+        let schema2_table2 =
+            FromClause::Table(QualifiedTableName::from(Identifier::Compound(vec![
+                "schema2".to_string(),
+                "table2".to_string(),
+            ])));
+
+        let schema3_table3 = FromClause::Table(QualifiedTableName {
+            table_id: Identifier::Compound(vec!["schema3".to_string(), "table3".to_string()]),
+            alias: Some("table3_alias".to_string()),
+            indexed_type: None,
+        });
+
+        let indexed_table = FromClause::Table(QualifiedTableName {
+            table_id: Identifier::Single("indexed_table".to_string()),
+            alias: Some("t1".to_string()),
+            indexed_type: Some(IndexedType::Indexed("index_1".to_string())),
+        });
+
+        let not_indexed_table = FromClause::Table(QualifiedTableName {
+            table_id: Identifier::Single("not_indexed_table".to_string()),
+            alias: Some("t2".to_string()),
+            indexed_type: Some(IndexedType::NotIndexed),
+        });
+
+        let subquery = FromClause::Subquery(SelectFromSubquery {
+            subquery: Box::new(select_from(FromClause::Table(QualifiedTableName::from(
+                Identifier::Single("table_2".to_string()),
+            )))),
+            alias: Some("select_alias".to_string()),
+        });
+
+        let expected_statement = select_from(FromClause::Froms(vec![join(
+            table_1,
+            join(
+                schema2_table2,
+                join(
+                    schema3_table3,
+                    join(indexed_table, join(not_indexed_table, subquery)),
+                ),
+            ),
+        )]));
+
+        run_sunny_day_test(
+            "SELECT * FROM (
+                    table_1,
+                    schema2.table2,
+                    schema3.table3 as table3_alias,
+                    indexed_table as t1 INDEXED BY index_1,
+                    not_indexed_table as t2 NOT INDEXED,
+                    (SELECT * FROM table_2) as select_alias
+                )",
+            Statement::Select(expected_statement),
+        );
+    }
+}

src/parser/select/from/mod.rs

@@ -150,84 +150,3 @@ mod select_from_table {
         );
     }
 }
-
-// #[cfg(test)]
-// mod test_select_from_comma_separated_table_or_subqueries {
-//     use super::test_utils::select_from;
-//     use crate::parser::test_utils::*;
-//     use crate::{
-//         FromClause, Identifier, IndexedType, JoinClause, JoinTable, JoinType, QualifiedTableName,
-//         SelectFromSubquery, Statement,
-//     };
-
-//     #[test]
-//     fn test_select_from_comma_separated_table_or_subqueries() {
-//         fn join(lhs: FromClause, rhs: FromClause) -> FromClause {
-//             FromClause::Join(JoinClause {
-//                 lhs_table: Box::new(lhs),
-//                 join_tables: vec![JoinTable {
-//                     join_type: JoinType::Cross,
-//                     table: Box::new(rhs),
-//                     constraints: None,
-//                 }],
-//             })
-//         }
-
-//         let table_1 = FromClause::Table(QualifiedTableName::from(Identifier::Single(
-//             "table_1".to_string(),
-//         )));
-//         let schema2_table2 =
-//             FromClause::Table(QualifiedTableName::from(Identifier::Compound(vec![
-//                 "schema2".to_string(),
-//                 "table2".to_string(),
-//             ])));
-
-//         let schema3_table3 = FromClause::Table(QualifiedTableName {
-//             table_id: Identifier::Compound(vec!["schema3".to_string(), "table3".to_string()]),
-//             alias: Some("table3_alias".to_string()),
-//             indexed_type: None,
-//         });
-
-//         let indexed_table = FromClause::Table(QualifiedTableName {
-//             table_id: Identifier::Single("indexed_table".to_string()),
-//             alias: Some("t1".to_string()),
-//             indexed_type: Some(IndexedType::Indexed("index_1".to_string())),
-//         });
-
-//         let not_indexed_table = FromClause::Table(QualifiedTableName {
-//             table_id: Identifier::Single("not_indexed_table".to_string()),
-//             alias: Some("t2".to_string()),
-//             indexed_type: Some(IndexedType::NotIndexed),
-//         });
-
-//         let subquery = FromClause::Subquery(SelectFromSubquery {
-//             subquery: Box::new(select_from(FromClause::Table(QualifiedTableName::from(
-//                 Identifier::Single("table_2".to_string()),
-//             )))),
-//             alias: Some("select_alias".to_string()),
-//         });
-
-//         let expected_statement = select_from(FromClause::Froms(vec![join(
-//             table_1,
-//             join(
-//                 schema2_table2,
-//                 join(
-//                     schema3_table3,
-//                     join(indexed_table, join(not_indexed_table, subquery)),
-//                 ),
-//             ),
-//         )]));
-
-//         run_sunny_day_test(
-//             "SELECT * FROM (
-//                     table_1,
-//                     schema2.table2,
-//                     schema3.table3 as table3_alias,
-//                     indexed_table as t1 INDEXED BY index_1,
-//                     not_indexed_table as t2 NOT INDEXED,
-//                     (SELECT * FROM table_2) as select_alias
-//                 )",
-//             Statement::Select(expected_statement),
-//         );
-//     }
-// }