sql (fix): ResolvedIdentifier can wrongly have a qualifier (#3142)

wvlet · Aug 17, 2023 · 42862fb · 42862fb
1 parent 016f929
commit 42862fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/airframe-sql/src/main/scala/wvlet/airframe/sql/analyzer/TypeResolver.scala b/airframe-sql/src/main/scala/wvlet/airframe/sql/analyzer/TypeResolver.scala
@@ -451,7 +451,7 @@ object TypeResolver extends LogSupport {
 
     val results = expr match {
       case i: Identifier =>
-        lookup(i.value, context).map(toResolvedAttribute(i.value, _))
+        lookup(i.value, context).map(toResolvedAttribute(i.value, _).withQualifier(None))
       case u @ UnresolvedAttribute(qualifier, name, _, _) =>
         lookup(u.fullName, context).map(toResolvedAttribute(name, _).withQualifier(qualifier))
       case a @ AllColumns(qualifier, None, _, _) =>

diff --git a/airframe-sql/src/test/scala/wvlet/airframe/sql/analyzer/TypeResolverTest.scala b/airframe-sql/src/test/scala/wvlet/airframe/sql/analyzer/TypeResolverTest.scala
@@ -1138,4 +1138,15 @@ class TypeResolverTest extends AirSpec with ResolverTestHelper {
       col.sourceColumn.head.fullName shouldBe "A.id"
     }
   }
+
+  test("Resolve identifier refers to column alias for qualified column") {
+    val p1 = analyze("select count(xid) from (select n1.id as xid from A n1 inner join B on n1.id = B.id)")
+    p1.outputAttributes shouldMatch { case List(SingleColumn(f: FunctionCall, None, None, _)) =>
+      f.functionName shouldBe "count"
+      f.args shouldMatch { case Seq(col: ResolvedAttribute) =>
+        col.fullName shouldBe "xid"
+        col.sourceColumn.map(_.column) shouldBe Some(a1)
+      }
+    }
+  }
 }