Skip to content

fix: replace CTEs with joins #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/lib/PostgresMetaTables.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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`
2 changes: 0 additions & 2 deletions src/lib/sql/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
16 changes: 0 additions & 16 deletions src/lib/sql/primary_keys.sql

This file was deleted.

25 changes: 0 additions & 25 deletions src/lib/sql/relationships_old.sql

This file was deleted.

67 changes: 66 additions & 1 deletion src/lib/sql/tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,67 @@ 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(pk.primary_keys, '[]') 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
table_id,
jsonb_agg(_pk.*) as primary_keys
from (
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 _pk
group by table_id
) as pk
on pk.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'
Comment on lines +54 to +76
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just relationships_old.sql but inlined

) 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)
Expand All @@ -31,3 +88,11 @@ WHERE
)
OR has_any_column_privilege(c.oid, 'SELECT, INSERT, UPDATE, REFERENCES')
)
group by
c.oid,
c.relname,
c.relrowsecurity,
c.relforcerowsecurity,
c.relreplident,
nc.nspname,
pk.primary_keys