airframe-sql: Fix column aliasing in CTEResolver

wvlet · Feb 9, 2023 · a7ebe6a · a7ebe6a
1 parent d576c60
commit a7ebe6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/airframe-sql/src/main/scala/wvlet/airframe/sql/analyzer/CTEResolver.scala b/airframe-sql/src/main/scala/wvlet/airframe/sql/analyzer/CTEResolver.scala
@@ -46,7 +46,7 @@ object CTEResolver extends LogSupport {
             }
             // Add a projection for renaming columns
             val selectItems = resolvedQuery.outputAttributes.zip(aliases).map { case (col, alias) =>
-              SingleColumn(col, None, col.nodeLocation).withAlias(alias.value)
+              col.withAlias(alias.value)
             }
             Project(resolvedQuery, selectItems, resolvedQuery.nodeLocation)
         }

diff --git a/airframe-sql/src/test/scala/wvlet/airframe/sql/parser/SQLGeneratorTest.scala b/airframe-sql/src/test/scala/wvlet/airframe/sql/parser/SQLGeneratorTest.scala
@@ -171,4 +171,11 @@ class SQLGeneratorTest extends AirSpec {
     val sql = SQLGenerator.print(resolvedPlan).toLowerCase
     sql shouldBe "select * from a as t1"
   }
+
+  test("CTE with column names") {
+    val resolvedPlan =
+      SQLAnalyzer.analyze("with t1 (xid) as (select id as pid from A) select xid from t1", "default", demoCatalog)
+    val sql = SQLGenerator.print(resolvedPlan).toLowerCase
+    sql shouldBe "with t1 as (select id as xid from (select id as pid from a)) select xid from t1"
+  }
 }