fix: replace CTEs with joins

src/lib/PostgresMetaTables.ts

@@ -1,7 +1,7 @@
 import { ident, literal } from 'pg-format'
 import { DEFAULT_SYSTEM_SCHEMAS } from './constants.js'
 import { coalesceRowsToArray, filterByList } from './helpers.js'
-import { columnsSql, primaryKeysSql, relationshipsOldSql, tablesSql } from './sql/index.js'
+import { columnsSql, tablesSql } from './sql/index.js'
 import {
   PostgresMetaResult,
   PostgresTable,
@@ -250,15 +250,7 @@ COMMIT;`
 const generateEnrichedTablesSql = ({ includeColumns }: { includeColumns: boolean }) => `
 with tables as (${tablesSql})
   ${includeColumns ? `, columns as (${columnsSql})` : ''}
-  , primary_keys as (${primaryKeysSql})
-  , relationships as (${relationshipsOldSql})
 select
   *
   ${includeColumns ? `, ${coalesceRowsToArray('columns', 'columns.table_id = tables.id')}` : ''}
-  , ${coalesceRowsToArray('primary_keys', 'primary_keys.table_id = tables.id')}
-  , ${coalesceRowsToArray(
-    'relationships',
-    `(relationships.source_schema = tables.schema AND relationships.source_table_name = tables.name)
-       OR (relationships.target_table_schema = tables.schema AND relationships.target_table_name = tables.name)`
-  )}
 from tables`

src/lib/sql/index.ts

@@ -13,13 +13,11 @@ export const materializedViewsSql = await readFile(
   'utf-8'
 )
 export const policiesSql = await readFile(join(__dirname, 'policies.sql'), 'utf-8')
-export const primaryKeysSql = await readFile(join(__dirname, 'primary_keys.sql'), 'utf-8')
 export const publicationsSql = await readFile(join(__dirname, 'publications.sql'), 'utf-8')
 export const tableRelationshipsSql = await readFile(
   join(__dirname, 'table_relationships.sql'),
   'utf-8'
 )
-export const relationshipsOldSql = await readFile(join(__dirname, 'relationships_old.sql'), 'utf-8')
 export const rolesSql = await readFile(join(__dirname, 'roles.sql'), 'utf-8')
 export const schemasSql = await readFile(join(__dirname, 'schemas.sql'), 'utf-8')
 export const tablesSql = await readFile(join(__dirname, 'tables.sql'), 'utf-8')

src/lib/sql/tables.sql

@@ -16,10 +16,64 @@ SELECT
   ) AS size,
   pg_stat_get_live_tuples(c.oid) AS live_rows_estimate,
   pg_stat_get_dead_tuples(c.oid) AS dead_rows_estimate,
-  obj_description(c.oid) AS comment
+  obj_description(c.oid) AS comment,
+  coalesce(
+    jsonb_agg(primary_keys) filter (where primary_keys is not null),
+    '[]'
+  ) as primary_keys,
+  coalesce(
+    jsonb_agg(relationships) filter (where relationships is not null),
+    '[]'
+  ) as relationships
 FROM
   pg_namespace nc
   JOIN pg_class c ON nc.oid = c.relnamespace
+  left join (
+    select
+      n.nspname as schema,
+      c.relname as table_name,
+      a.attname as name,
+      c.oid :: int8 as table_id
+    from
+      pg_index i,
+      pg_class c,
+      pg_attribute a,
+      pg_namespace n
+    where
+      i.indrelid = c.oid
+      and c.relnamespace = n.oid
+      and a.attrelid = c.oid
+      and a.attnum = any (i.indkey)
+      and i.indisprimary
+  ) as primary_keys
+  on primary_keys.table_id = c.oid
+  left join (
+    select
+      c.oid :: int8 as id,
+      c.conname as constraint_name,
+      nsa.nspname as source_schema,
+      csa.relname as source_table_name,
+      sa.attname as source_column_name,
+      nta.nspname as target_table_schema,
+      cta.relname as target_table_name,
+      ta.attname as target_column_name
+    from
+      pg_constraint c
+    join (
+      pg_attribute sa
+      join pg_class csa on sa.attrelid = csa.oid
+      join pg_namespace nsa on csa.relnamespace = nsa.oid
+    ) on sa.attrelid = c.conrelid and sa.attnum = any (c.conkey)
+    join (
+      pg_attribute ta
+      join pg_class cta on ta.attrelid = cta.oid
+      join pg_namespace nta on cta.relnamespace = nta.oid
+    ) on ta.attrelid = c.confrelid and ta.attnum = any (c.confkey)
+    where
+      c.contype = 'f'
+  ) as relationships
+  on (relationships.source_schema = nc.nspname and relationships.source_table_name = c.relname)
+  or (relationships.target_table_schema = nc.nspname and relationships.target_table_name = c.relname)
 WHERE
   c.relkind IN ('r', 'p')
   AND NOT pg_is_other_temp_schema(nc.oid)
@@ -31,3 +85,5 @@ WHERE
     )
     OR has_any_column_privilege(c.oid, 'SELECT, INSERT, UPDATE, REFERENCES')
   )
+group by
+  c.oid, nc.nspname

test/lib/tables.ts

@@ -465,12 +465,12 @@ test('primary keys', async () => {
         "name": "t",
         "primary_keys": [
           {
-            "name": "c",
+            "name": "cc",
             "schema": "public",
             "table_name": "t",
           },
           {
-            "name": "cc",
+            "name": "c",
             "schema": "public",
             "table_name": "t",
           },