Support subquery

bustubx/src/expression/column.rs

@@ -2,7 +2,7 @@ use crate::catalog::Schema;
 use crate::catalog::{Column, DataType};
 use crate::common::ScalarValue;
 use crate::common::TableReference;
-use crate::error::{BustubxResult};
+use crate::error::BustubxResult;
 use crate::expression::ExprTrait;
 use crate::storage::Tuple;
 

bustubx/src/parser/mod.rs

@@ -1,17 +1,18 @@
 use crate::error::BustubxResult;
 use sqlparser::{ast::Statement, dialect::PostgreSqlDialect, parser::Parser};
-use tracing::span;
 
 pub fn parse_sql(sql: &str) -> BustubxResult<Vec<Statement>> {
     let stmts = Parser::parse_sql(&PostgreSqlDialect {}, sql)?;
     Ok(stmts)
 }
 
+#[cfg(test)]
 mod tests {
+
     #[test]
-    pub fn test_sql() {
-        let sql = "select * from t1, t2, t3 inner join t4 on t3.id = t4.id";
+    pub fn test_parser() {
+        let sql = "select * from (select * from t1)";
         let stmts = super::parse_sql(sql).unwrap();
-        println!("{:?}", stmts);
+        println!("{:#?}", stmts[0]);
     }
 }

bustubx/src/planner/logical_planner/plan_set_expr.rs

@@ -229,6 +229,9 @@ impl LogicalPlanner<'_> {
                 // TODO handle alias
                 self.plan_table_with_joins(table_with_joins)
             }
+            sqlparser::ast::TableFactor::Derived {
+                subquery, alias, ..
+            } => self.plan_query(subquery),
             _ => Err(BustubxError::Plan(format!(
                 "sqlparser relation {} not supported",
                 relation

tests/sqllogictest/slt/subquery.slt

@@ -0,0 +1,17 @@
+statement ok
+create table t1 (a int, b int)
+
+statement ok
+insert into t1 values (2, 3), (5, 4)
+
+query II rowsort
+select * from (select * from t1)
+----
+2 3
+5 4
+
+query II rowsort
+select * from (select b from t1)
+----
+3
+4