Revert "fix: Ensure column names do not change with expand_views_at_output (apache#19019)" (#73)

This reverts commit 2626fc2.

Author: LiaCastaneda

datafusion/expr/src/expr_rewriter/mod.rs

@@ -260,11 +260,7 @@ fn coerce_exprs_for_schema(
                     }
                     #[expect(deprecated)]
                     Expr::Wildcard { .. } => Ok(expr),
-                    _ => {
-                        // maintain the original name when casting
-                        let name = dst_schema.field(idx).name();
-                        Ok(expr.cast_to(new_type, src_schema)?.alias(name))
-                    }
+                    _ => expr.cast_to(new_type, src_schema),
                 }
             } else {
                 Ok(expr)

datafusion/optimizer/src/analyzer/type_coercion.rs

@@ -1441,7 +1441,7 @@ mod test {
             true,
             plan.clone(),
             @r"
-        Projection: CAST(a AS LargeUtf8) AS a
+        Projection: CAST(a AS LargeUtf8)
           EmptyRelation: rows=0
         "
         )?;
@@ -1477,7 +1477,7 @@ mod test {
             true,
             plan.clone(),
             @r"
-        Projection: CAST(a AS LargeUtf8) AS a
+        Projection: CAST(a AS LargeUtf8)
           EmptyRelation: rows=0
         "
         )?;
@@ -1507,7 +1507,7 @@ mod test {
             true,
             sort_plan.clone(),
             @r"
-        Projection: CAST(a AS LargeUtf8) AS a
+        Projection: CAST(a AS LargeUtf8)
           Sort: a ASC NULLS FIRST
             Projection: a
               EmptyRelation: rows=0
@@ -1536,7 +1536,7 @@ mod test {
             true,
             plan.clone(),
             @r"
-        Projection: CAST(a AS LargeUtf8) AS a
+        Projection: CAST(a AS LargeUtf8)
           Sort: a ASC NULLS FIRST
             Projection: a
               EmptyRelation: rows=0
@@ -1572,7 +1572,7 @@ mod test {
             true,
             plan.clone(),
             @r"
-        Projection: CAST(a AS LargeBinary) AS a
+        Projection: CAST(a AS LargeBinary)
           EmptyRelation: rows=0
         "
         )?;
@@ -1629,7 +1629,7 @@ mod test {
             true,
             sort_plan.clone(),
             @r"
-        Projection: CAST(a AS LargeBinary) AS a
+        Projection: CAST(a AS LargeBinary)
           Sort: a ASC NULLS FIRST
             Projection: a
               EmptyRelation: rows=0
@@ -1660,7 +1660,7 @@ mod test {
             true,
             plan.clone(),
             @r"
-        Projection: CAST(a AS LargeBinary) AS a
+        Projection: CAST(a AS LargeBinary)
           Sort: a ASC NULLS FIRST
             Projection: a
               EmptyRelation: rows=0

datafusion/optimizer/tests/optimizer_integration.rs

@@ -538,15 +538,14 @@ fn recursive_cte_projection_pushdown() -> Result<()> {
     // columns from the base table and recursive table, eliminating unused columns
     assert_snapshot!(
         format!("{plan}"),
-        @r"
-    SubqueryAlias: nodes
-      RecursiveQuery: is_distinct=false
-        Projection: test.col_int32 AS id
-          TableScan: test projection=[col_int32]
-        Projection: CAST(CAST(nodes.id AS Int64) + Int64(1) AS Int32) AS id
-          Filter: nodes.id < Int32(3)
-            TableScan: nodes projection=[id]
-    "
+        @r#"SubqueryAlias: nodes
+  RecursiveQuery: is_distinct=false
+    Projection: test.col_int32 AS id
+      TableScan: test projection=[col_int32]
+    Projection: CAST(CAST(nodes.id AS Int64) + Int64(1) AS Int32)
+      Filter: nodes.id < Int32(3)
+        TableScan: nodes projection=[id]
+"#
     );
     Ok(())
 }
@@ -562,16 +561,14 @@ fn recursive_cte_with_aliased_self_reference() -> Result<()> {
 
     assert_snapshot!(
         format!("{plan}"),
-        @r"
-    SubqueryAlias: nodes
-      RecursiveQuery: is_distinct=false
-        Projection: test.col_int32 AS id
-          TableScan: test projection=[col_int32]
-        Projection: CAST(CAST(child.id AS Int64) + Int64(1) AS Int32) AS id
-          SubqueryAlias: child
-            Filter: nodes.id < Int32(3)
-              TableScan: nodes projection=[id]
-    ",
+        @r#"SubqueryAlias: nodes
+  RecursiveQuery: is_distinct=false
+    Projection: test.col_int32 AS id
+      TableScan: test projection=[col_int32]
+    Projection: CAST(CAST(child.id AS Int64) + Int64(1) AS Int32)
+      SubqueryAlias: child
+        Filter: nodes.id < Int32(3)
+          TableScan: nodes projection=[id]"#,
     );
     Ok(())
 }
@@ -624,16 +621,15 @@ fn recursive_cte_projection_pushdown_baseline() -> Result<()> {
     // and only the needed column is selected from the recursive table
     assert_snapshot!(
         format!("{plan}"),
-        @r"
-    SubqueryAlias: countdown
-      RecursiveQuery: is_distinct=false
-        Projection: test.col_int32 AS n
-          Filter: test.col_int32 = Int32(5)
-            TableScan: test projection=[col_int32]
-        Projection: CAST(CAST(countdown.n AS Int64) - Int64(1) AS Int32) AS n
-          Filter: countdown.n > Int32(1)
-            TableScan: countdown projection=[n]
-    "
+        @r#"SubqueryAlias: countdown
+  RecursiveQuery: is_distinct=false
+    Projection: test.col_int32 AS n
+      Filter: test.col_int32 = Int32(5)
+        TableScan: test projection=[col_int32]
+    Projection: CAST(CAST(countdown.n AS Int64) - Int64(1) AS Int32)
+      Filter: countdown.n > Int32(1)
+        TableScan: countdown projection=[n]
+"#
     );
     Ok(())
 }

datafusion/sqllogictest/test_files/cast.slt

@@ -89,39 +89,3 @@ select * from t0 where v0<1e100;
 
 statement ok
 drop table t0;
-
-
-# ensure that automatically casting with "datafusion.optimizer.expand_views_at_output" does not
-# change the column name
-
-statement ok
-create table t(a int, b varchar);
-
-statement ok
-set datafusion.optimizer.expand_views_at_output = true;
-
-query TT
-explain select * from t;
-----
-logical_plan
-01)Projection: t.a, CAST(t.b AS LargeUtf8) AS b
-02)--TableScan: t projection=[a, b]
-physical_plan
-01)ProjectionExec: expr=[a@0 as a, CAST(b@1 AS LargeUtf8) as b]
-02)--DataSourceExec: partitions=1, partition_sizes=[0]
-
-query TT
-explain select b from t;
-----
-logical_plan
-01)Projection: CAST(t.b AS LargeUtf8) AS b
-02)--TableScan: t projection=[b]
-physical_plan
-01)ProjectionExec: expr=[CAST(b@0 AS LargeUtf8) as b]
-02)--DataSourceExec: partitions=1, partition_sizes=[0]
-
-statement ok
-set datafusion.optimizer.expand_views_at_output = false;
-
-statement ok
-drop table t;