fix(cubesql): Fix push down column remapping

luabase · Mar 10, 2024 · c7736cc · c7736cc
1 parent cd67a7c
commit c7736cc
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/rust/cubesql/cubesql/src/compile/engine/df/wrapper.rs b/rust/cubesql/cubesql/src/compile/engine/df/wrapper.rs
@@ -901,10 +901,19 @@ impl CubeScanWrapperNode {
             };
             if !next_remapping.contains_key(&Column::from_name(&alias)) {
                 next_remapping.insert(original_alias_key, Column::from_name(&alias));
+                let original_relation = if let Expr::Column(column) = &original_expr {
+                    if column.relation.is_some() {
+                        &column.relation
+                    } else {
+                        &from_alias
+                    }
+                } else {
+                    &from_alias
+                };
                 next_remapping.insert(
                     Column {
                         name: original_alias.clone(),
-                        relation: from_alias.clone(),
+                        relation: original_relation.clone(),
                     },
                     Column {
                         name: alias.clone(),