fix: postgres columns

Author: tobymao

sqlmesh/core/engine_adapter/base_postgres.py

@@ -33,18 +33,18 @@ def _columns_query(self, table: exp.Table) -> exp.Select:
                 "pg_catalog.format_type(atttypid, atttypmod) AS data_type",
             )
             .from_("pg_catalog.pg_attribute")
-            .join("pg_catalog.pg_class", on="oid = attrelid")
-            .join("pg_catalog.pg_namespace", on="oid = relnamespace")
+            .join("pg_catalog.pg_class", on="pg_class.oid = attrelid")
+            .join("pg_catalog.pg_namespace", on="pg_namespace.oid = relnamespace")
             .where(
                 exp.and_(
                     "attnum > 0",
                     "NOT attisdropped",
-                    exp.column("nspname").eq(table.alias_or_name),
+                    exp.column("relname").eq(table.alias_or_name),
                 )
             )
         )
         if table.args.get("db"):
-            sql = sql.where(exp.column("relname").eq(table.args["db"].name))
+            sql = sql.where(exp.column("nspname").eq(table.args["db"].name))
         return sql
 
     def columns(

tests/core/engine_adapter/test_base_postgres.py

@@ -19,9 +19,9 @@ def test_columns(make_mocked_engine_adapter: t.Callable):
         'SELECT "attname" AS "column_name", '
         '"pg_catalog".FORMAT_TYPE("atttypid", "atttypmod") AS "data_type" '
         'FROM "pg_catalog"."pg_attribute" '
-        'JOIN "pg_catalog"."pg_class" ON "oid" = "attrelid" '
-        'JOIN "pg_catalog"."pg_namespace" ON "oid" = "relnamespace" '
-        """WHERE ("attnum" > 0 AND NOT "attisdropped" AND "nspname" = 'table') AND "relname" = 'db'"""
+        'JOIN "pg_catalog"."pg_class" ON "pg_class"."oid" = "attrelid" '
+        'JOIN "pg_catalog"."pg_namespace" ON "pg_namespace"."oid" = "relnamespace" '
+        """WHERE ("attnum" > 0 AND NOT "attisdropped" AND "relname" = 'table') AND "nspname" = 'db'"""
     )
     assert resp == {"col": exp.DataType.build("INT")}