fix: remove oid-to-name conversions

Turns out that oid :: reg* :: text leaves behind some quotes:
https://stackoverflow.com/questions/55981426/how-to-convert-regclass-to-string-without-quotes

We don't want this, especially when doing filtering or showing it to the
frontend, so we should use `name` columns from the corresponding system
catalogs instead.

Author: soedirgo

src/api/tables.ts

@@ -150,8 +150,8 @@ const getTablesSql = (sqlTemplates) => {
       FROM
         relationships
       WHERE
-        (relationships.source_schema :: text = tables.schema AND relationships.source_table_name :: text = tables.name)
-        OR (relationships.target_table_schema :: text = tables.schema AND relationships.target_table_name :: text = 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;`.trim()
 }
@@ -183,8 +183,8 @@ const selectSingleSql = (sqlTemplates: { [key: string]: string }, id: number) =>
       FROM
         relationships
       WHERE
-        (relationships.source_schema :: text = tables.schema AND relationships.source_table_name :: text = tables.name)
-        OR (relationships.target_table_schema :: text = tables.schema AND relationships.target_table_name :: text = 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;`.trim()
 }
@@ -223,8 +223,8 @@ const selectSingleByName = (
       FROM
         relationships
       WHERE
-        (relationships.source_schema :: text = tables.schema AND relationships.source_table_name :: text = tables.name)
-        OR (relationships.target_table_schema :: text = tables.schema AND relationships.target_table_name :: text = 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;`.trim()
 }

src/lib/sql/columns.sql

@@ -59,7 +59,7 @@ SELECT
       FROM
         pg_catalog.pg_enum enums
       WHERE
-        COALESCE(bt.typname, t.typname) = format_type(enums.enumtypid :: regclass, NULL)
+        COALESCE(bt.typname, t.typname) = format_type(enums.enumtypid, NULL)
       ORDER BY
         enums.enumsortorder
     )

src/lib/sql/extensions.sql

@@ -1,9 +1,10 @@
 SELECT
   e.name,
-  x.extnamespace :: regnamespace AS schema,
+  n.nspname AS schema,
   e.default_version,
   x.extversion AS installed_version,
   e.comment
 FROM
   pg_available_extensions() e(name, default_version, comment)
   LEFT JOIN pg_extension x ON e.name = x.extname
+  LEFT JOIN pg_namespace n ON x.extnamespace = n.oid

src/lib/sql/primary_keys.sql

@@ -1,6 +1,6 @@
 SELECT
   n.nspname AS schema,
-  c.oid :: regclass AS table_name,
+  c.relname AS table_name,
   a.attname AS name,
   c.oid :: int8 AS table_id
 FROM

src/lib/sql/publications.sql

@@ -1,7 +1,7 @@
 SELECT
   p.oid :: int8 AS id,
   p.pubname AS name,
-  p.pubowner :: regrole AS owner,
+  r.rolname AS owner,
   p.pubinsert AS publish_insert,
   p.pubupdate AS publish_update,
   p.pubdelete AS publish_delete,
@@ -15,14 +15,16 @@ FROM
   LEFT JOIN LATERAL (
     SELECT
       COALESCE(
-        array_agg(pr.prrelid :: regclass :: text) filter (
+        array_agg(c.relname :: text) filter (
           WHERE
-            pr.prrelid IS NOT NULL
+            c.relname IS NOT NULL
         ),
         '{}'
       ) AS tables
     FROM
       pg_catalog.pg_publication_rel AS pr
+      JOIN pg_class AS c ON pr.prrelid = c.oid
     WHERE
       pr.prpubid = p.oid
   ) AS pr ON 1 = 1
+  JOIN pg_roles AS r ON p.pubowner = r.oid

src/lib/sql/relationships.sql

@@ -1,22 +1,24 @@
 SELECT
   c.oid :: int8 AS id,
   c.conname AS constraint_name,
-  csa.relnamespace :: regnamespace AS source_schema,
-  c.conrelid :: regclass AS source_table_name,
+  nsa.nspname AS source_schema,
+  csa.relname AS source_table_name,
   sa.attname AS source_column_name,
-  cta.relnamespace :: regnamespace AS target_table_schema,
-  c.confrelid :: regclass AS target_table_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

test/integration/index.spec.js

@@ -219,6 +219,14 @@ describe('/tables', async () => {
     assert.equal(true, relationship.target_table_schema === 'public')
     assert.equal(true, relationship.target_table_name === 'users')
   })
+  it('/tables should return relationships for quoted names', async () => {
+    const tables = await axios.get(`${URL}/tables`)
+    const todos = tables.data.find((x) => `${x.schema}.${x.name}` === 'public.todos')
+    const relationship = todos.relationships.find(
+      (x) => x.source_schema === 'public' && x.source_table_name === 'todos'
+    )
+    assert.equal(true, relationship.source_column_name === 'user-id')
+  })
   it('GET /tables with system tables', async () => {
     const res = await axios.get(`${URL}/tables?include_system_schemas=true`)
     const included = res.data.find((x) => `${x.schema}.${x.name}` === 'pg_catalog.pg_type')

test/postgres/mnt/00-init.sql

@@ -17,11 +17,11 @@ VALUES
 CREATE TABLE public.todos (
   id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
   details text,
-  user_id bigint REFERENCES users NOT NULL
+  "user-id" bigint REFERENCES users NOT NULL
 );
 
 INSERT INTO 
-    public.todos (details, user_id)
+    public.todos (details, "user-id")
 VALUES 
     ('Star the repo', 1),
     ('Watch the releases', 2);