Reuse ScopedExpression child name

G-Research · Nov 5, 2024 · 517b616 · 517b616
1 parent cded2a9
commit 517b616
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -458,7 +458,11 @@ class Analyzer(override val catalogManager: CatalogManager) extends RuleExecutor
         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))()