fix: obscure policies CTE bug

Author: soedirgo

src/lib/PostgresMetaRoles.ts

@@ -35,7 +35,7 @@ WITH roles AS (${
   })
 SELECT
   *,
-  ${coalesceRowsToArray('grants', 'SELECT * FROM grants WHERE grants.grantee = roles.name')}
+  ${coalesceRowsToArray('grants', 'grants.grantee = roles.name')}
 FROM
   roles`
     if (limit) {

src/lib/PostgresMetaTables.ts

@@ -211,21 +211,13 @@ WITH tables AS (${tablesSql}),
   relationships AS (${relationshipsSql})
 SELECT
   *,
-  ${coalesceRowsToArray('columns', 'SELECT * FROM columns WHERE columns.table_id = tables.id')},
-  ${coalesceRowsToArray('grants', 'SELECT * FROM grants WHERE grants.table_id = tables.id')},
-  ${coalesceRowsToArray('policies', 'SELECT * FROM policies WHERE policies.table_id = tables.id')},
-  ${coalesceRowsToArray(
-    'primary_keys',
-    'SELECT * FROM primary_keys WHERE primary_keys.table_id = tables.id'
-  )},
+  ${coalesceRowsToArray('columns', 'columns.table_id = tables.id')},
+  ${coalesceRowsToArray('grants', 'grants.table_id = tables.id')},
+  ${coalesceRowsToArray('policies', 'policies.table_id = tables.id')},
+  ${coalesceRowsToArray('primary_keys', 'primary_keys.table_id = tables.id')},
   ${coalesceRowsToArray(
     'relationships',
-    `SELECT
-       *
-     FROM
-       relationships
-     WHERE
-       (relationships.source_schema = tables.schema AND relationships.source_table_name = tables.name)
+    `(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/helpers.ts

@@ -1,13 +1,12 @@
-export const coalesceRowsToArray = (source: string, joinQuery: string) => {
-  // Note that array_to_json(array_agg(row_to_json())) seems to perform better than json_agg
+export const coalesceRowsToArray = (source: string, filter: string) => {
   return `
 COALESCE(
   (
     SELECT
-      array_to_json(array_agg(row_to_json(${source})))
+      array_agg(row_to_json(${source})) FILTER (WHERE ${filter})
     FROM
-      ( ${joinQuery} ) ${source}
+      ${source}
   ),
-  '[]'
+  '{}'
 ) AS ${source}`
 }