fix: SQL name resolving

edb/pgsql/resolver/expr.py

@@ -201,7 +201,8 @@ def _lookup_in_table(
 def _lookup_table(tab_name: str, ctx: Context) -> context.Table:
     matched_tables: List[context.Table] = []
     for t in ctx.scope.tables:
-        if t.name == tab_name or t.alias == tab_name:
+        t_name = t.alias or t.name
+        if t_name == tab_name:
             matched_tables.append(t)
 
     if not matched_tables:

tests/test_sql_query.py

@@ -154,7 +154,7 @@ async def test_sql_query_11(self):
         res = await self.scon.fetch(
             '''
             SELECT * FROM "Movie"
-            JOIN "Genre" g ON "Movie".genre_id = "Genre".id
+            JOIN "Genre" g ON "Movie".genre_id = g.id
             '''
         )
         self.assert_shape(res, 2, 7)
@@ -566,6 +566,26 @@ async def test_sql_query_37(self):
         )
         self.assertEqual(res, [['24']])
 
+    async def test_sql_query_38(self):
+        res = await self.squery_values(
+            '''
+            WITH users AS (
+              SELECT 1 as id, NULL as managed_by
+              UNION ALL
+              SELECT 2 as id, 1 as managed_by
+            )
+            SELECT id, (
+              SELECT id FROM users e WHERE id = users.managed_by
+            ) as managed_by
+            FROM users
+            ORDER BY id
+            '''
+        )
+        self.assertEqual(res, [
+            [1, None],
+            [2, 1],
+        ])
+
     async def test_sql_query_introspection_00(self):
         dbname = self.con.dbname
         res = await self.squery_values(