fix: sqllogictest

Signed-off-by: Kould <[email protected]>

Author: KKould

src/query/sql/src/planner/binder/column_binding.rs

@@ -93,7 +93,7 @@ impl ColumnBinding {
         self.source_table_index
             .or(self.table_index)
             .map(|table_index| ColumnBinding {
-                database_name: None,
+                database_name: self.database_name.clone(),
                 table_name: None,
                 column_position: self.column_position,
                 table_index: Some(table_index),

src/query/sql/src/planner/optimizer/rule/rewrite/rule_eliminate_subquery.rs

@@ -95,10 +95,17 @@ impl Rule for RuleEliminateSubquery {
         let new_column_bindings = {
             let guard = self.metadata.read();
 
-            let left_columns = guard.columns_by_table_index(left_used_tables[0]);
-            let right_columns = guard.columns_by_table_index(right_used_tables[0]);
             let left_table_index = left_used_tables[0];
+            let right_table_index = right_used_tables[0];
+            let left_columns = guard.columns_by_table_index(left_table_index);
+            let right_columns = guard.columns_by_table_index(right_table_index);
             let left_table = guard.table(left_table_index);
+            // filter table function
+            if left_table.database() == "system"
+                || guard.table(right_table_index).database() == "system"
+            {
+                return Ok(());
+            }
             let left_source_table_index = guard
                 .get_source_table_index(Some(left_table.database()), left_table.table().name());
 
@@ -270,6 +277,19 @@ impl VisitorMut<'_> for ExprAsSourceVisitor {
             self.failed = true;
             return Ok(());
         };
+        if binding.source_table_index.or(binding.table_index).is_none()
+            || binding.column_position.is_none()
+        {
+            self.failed = true;
+            return Ok(());
+        }
+        // filter table function
+        if matches!(
+            binding.database_name.as_ref().map(String::as_ref),
+            Some("system")
+        ) {
+            return Ok(());
+        }
         col.column = binding;
         Ok(())
     }

tests/sqllogictests/suites/query/subquery.test

@@ -946,12 +946,28 @@ WHERE t1.i1 = (
 statement ok
 create or replace table t1(a int, b int, c varchar(20));
 
+statement ok
+create or replace table t2(a int, b int, c varchar(20));
+
 statement ok
 insert into t1 (a, b, c) values (1, 7, 'D'), (2, 7, 'D'), (3, 7, 'D'), (4, 8, 'D'), (5, 7, 'E'), (6, 8, 'E');
 
+statement ok
+insert into t2 (a, b, c) VALUES (10, 7, 'X'), (11, 7, 'Y'), (12, 8, 'Z'), (13, 9, 'W');
+
 query T
 select t3.* from t1 as t3 where t3.c = 'D' and t3.a in (select t4.a from t1 as t4 where t4.b = 7);
 ----
 1 7 D
 2 7 D
 3 7 D
+
+query T rowsort
+select * from t1 as t3 inner join t2 as t5 on t3.b = t5.b where t3.c = 'D' and t3.a in (select t4.a from t1 as t4 where t4.b = 7);
+----
+1 7 D 10 7 X
+1 7 D 11 7 Y
+2 7 D 10 7 X
+2 7 D 11 7 Y
+3 7 D 10 7 X
+3 7 D 11 7 Y