From 553005a4e9aebcbb42c712efd833118235d205dc Mon Sep 17 00:00:00 2001 From: wangfei Date: Thu, 30 Apr 2015 12:30:15 +0800 Subject: [PATCH] fix test case --- .../apache/spark/sql/catalyst/analysis/Analyzer.scala | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 index 41230a94d62c1..02a5f08ed7ee9 100644 --- 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 @@ -91,12 +91,13 @@ class Analyzer( val withAlias = u.alias.map(Subquery(_, relation)) withAlias.getOrElse(relation) } - substituted.getOrElse(u) - i.copy(table = relation) + i.copy(table = substituted.getOrElse(u)) case u : UnresolvedRelation => - cteRelations.get(u.tableIdentifier.last) - .map(relation => u.alias.map(Subquery(_, relation)).getOrElse(relation)) - .getOrElse(u) + val substituted = cteRelations.get(u.tableIdentifier.last).map { relation => + val withAlias = u.alias.map(Subquery(_, relation)) + withAlias.getOrElse(relation) + } + substituted.getOrElse(u) } } }