Reuse ScopedExpression child name

G-Research · Nov 22, 2024 · 1ce9a5e · 1ce9a5e
1 parent a2a0678
commit 1ce9a5e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/AliasResolution.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/AliasResolution.scala
@@ -55,7 +55,11 @@ object AliasResolution {
       case e if !e.resolved => u
       case g: Generator => MultiAlias(g, Nil)
       case c @ Cast(ne: NamedExpression, _, _, _) => Alias(c, ne.name)()
-      case se @ ScopedExpression(ne: NamedExpression, _) => Alias(se, ne.name)()
+      case se @ ScopedExpression(e: Expression, _) =>
+        resolve(UnresolvedAlias(e, optGenAliasFunc)) match {
+          case ne: NamedExpression => Alias(se, ne.name)()
+          case _ => se
+        }
       case e: ExtractValue if extractOnly(e) => Alias(e, toPrettySQL(e))()
       case e if optGenAliasFunc.isDefined =>
         Alias(child, optGenAliasFunc.get.apply(e))()