refactor: update ID fields for the types

soedirgo · soedirgo · commit e996e3e5e7d8 · 2020-07-02T23:38:34.000+08:00
diff --git a/src/api/tables.ts b/src/api/tables.ts
@@ -18,14 +18,11 @@ primary_keys AS ( ${primary_keys} ),
 relationships AS ( ${relationships} )
 SELECT
   *,
-  ${coalesceRowsToArray(
-    'columns',
-    'SELECT * FROM columns WHERE columns.table_id = tables.table_id'
-  )},
-  ${coalesceRowsToArray('grants', 'SELECT * FROM grants WHERE grants.table_id = tables.table_id')},
+  ${coalesceRowsToArray('columns', 'SELECT * FROM columns WHERE columns.table_id = tables.id')},
+  ${coalesceRowsToArray('grants', 'SELECT * FROM grants WHERE grants.table_id = tables.id')},
   ${coalesceRowsToArray(
     'primary_keys',
-    'SELECT * FROM primary_keys WHERE primary_keys.table_id = tables.table_id'
+    'SELECT * FROM primary_keys WHERE primary_keys.table_id = tables.id'
   )},
   ${coalesceRowsToArray(
     'relationships',
@@ -34,8 +31,8 @@ SELECT
      FROM
        relationships
      WHERE
-       relationships.source_table_id = tables.table_id
-       OR relationships.target_table_id = tables.table_id`
+       (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`
diff --git a/src/lib/interfaces.ts b/src/lib/interfaces.ts
@@ -18,7 +18,7 @@ export namespace Roles {
   }
 
   export interface Grant {
-    table_id: string
+    table_id: number
     grantor: string
     grantee: string
     catalog: string
@@ -32,6 +32,7 @@ export namespace Roles {
 
 export namespace Schemas {
   export interface Schema {
+    id: number
     catalog_name: string
     name: string
     owner: string
@@ -44,7 +45,7 @@ export namespace Schemas {
 
 export namespace Tables {
   export interface Table {
-    table_id: string
+    id: string
     catalog: string
     schema: string
     name: string
@@ -81,19 +82,19 @@ export namespace Tables {
   }
 
   export interface Column {
+    table_id: number
     schema: string
     table: string
+    ordinal_position: number
     name: string
     default_value: string | null
-    is_identity: boolean
-    is_nullable: boolean
-    is_updatable: boolean
     data_type: string
     format: string
-    identity_generation: string | null
-    table_id: string
     description: string | null
-    enums: string[]
+    is_identity: boolean
+    identity_generation: string | null
+    is_nullable: boolean
+    is_updatable: boolean
   }
 
   export interface PrimaryKey {
@@ -104,11 +105,9 @@ export namespace Tables {
   }
 
   export interface Relationship {
-    source_table_id: string
     source_schema: string
     source_table_name: string
     source_column_name: string
-    target_table_id: string
     target_table_schema: string
     target_table_name: string
     target_column_name: string
@@ -118,7 +117,7 @@ export namespace Tables {
 
 export namespace Types {
   export interface Type {
-    type_id: string
+    id: number
     name: string
     schema: string
     format: string
diff --git a/src/lib/sql/columns.sql b/src/lib/sql/columns.sql
@@ -1,30 +1,22 @@
+-- We can uniquely point to a specific column using table_id + ordinal_position.
 SELECT
+  c.oid AS table_id,
   table_schema AS schema,
   table_name AS table,
+  ordinal_position,
   column_name AS name,
   column_default AS default_value,
-  is_identity :: boolean,
-  is_nullable :: boolean,
-  is_updatable :: boolean,
   data_type,
   udt_name AS format,
-  identity_generation,
-  (table_schema || '.' || table_name) AS table_id,
   col_description(
-    (table_schema || '."' || table_name || '"') :: regclass,
+    c.oid,
     ordinal_position
   ) AS description,
-  array_to_json(
-    array(
-      SELECT
-        enumlabel
-      FROM
-        pg_catalog.pg_enum enums
-      WHERE
-        udt_name = pg_catalog.Format_type(enums.enumtypid :: regclass, NULL)
-      ORDER BY
-        enums.enumsortorder
-    )
-  ) AS enums
+  is_identity::boolean,
+  identity_generation,
+  is_nullable::boolean,
+  is_updatable::boolean
 FROM
   information_schema.columns
+  JOIN pg_class c ON c.relnamespace = table_schema::text::regnamespace
+  AND c.relname = table_name::text
diff --git a/src/lib/sql/constraints.sql b/src/lib/sql/constraints.sql
@@ -1,4 +1,5 @@
 SELECT
+  c.oid AS id,
   COALESCE(table_schema, referenced_schema) AS table_schema,
   COALESCE(table_name, referenced_table) AS table_name,
   COALESCE(column_name, referenced_column) AS column_name,
@@ -10,9 +11,13 @@ SELECT
   referenced_table,
   referenced_column
 FROM
-  information_schema.table_constraints NATURAL FULL
-  JOIN information_schema.key_column_usage NATURAL FULL
-  JOIN information_schema.check_constraints
+  information_schema.table_constraints
+  -- This doesn't guarantee uniqueness, but works for now
+  JOIN pg_constraint c ON c.connamespace = table_schema::text::regnamespace
+  AND c.conrelid = table_name::text::regclass
+  AND c.conname = constraint_name
+  NATURAL FULL JOIN information_schema.key_column_usage
+  NATURAL FULL JOIN information_schema.check_constraints
   INNER JOIN (
     SELECT
       table_schema AS referenced_schema,
@@ -22,8 +27,6 @@ FROM
     FROM
       information_schema.constraint_column_usage
   ) AS referenced_columns USING (constraint_name)
-WHERE
-  constraint_schema = ?
 ORDER BY
   table_schema,
   table_name,
diff --git a/src/lib/sql/extensions_enabled.sql b/src/lib/sql/extensions_enabled.sql
@@ -1,4 +1,5 @@
 SELECT
+  e.oid AS id,
   e.extname AS name,
   e.extversion AS version,
   n.nspname AS schema,
diff --git a/src/lib/sql/grants.sql b/src/lib/sql/grants.sql
@@ -1,5 +1,5 @@
 SELECT
-  (table_schema || '.' || table_name) AS table_id,
+  c.oid AS table_id,
   grantor,
   grantee,
   table_catalog AS catalog,
@@ -10,3 +10,5 @@ SELECT
   with_hierarchy :: boolean
 FROM
   information_schema.role_table_grants
+  INNER JOIN pg_class c ON table_schema::text::regnamespace = c.relnamespace
+  AND table_name::text = c.relname
diff --git a/src/lib/sql/primary_keys.sql b/src/lib/sql/primary_keys.sql
@@ -1,18 +1,16 @@
 SELECT
-  pg_namespace.nspname AS schema,
-  pg_class.oid :: regclass AS table_name,
-  pg_attribute.attname AS name,
-  (
-    pg_namespace.nspname || '.' || (pg_class.oid :: regclass)
-  ) AS table_id
+  n.nspname AS schema,
+  c.oid :: regclass AS table_name,
+  a.attname AS name,
+  c.oid AS table_id
 FROM
-  pg_index,
-  pg_class,
-  pg_attribute,
-  pg_namespace
+  pg_index i,
+  pg_class c,
+  pg_attribute a,
+  pg_namespace n
 WHERE
-  indrelid = pg_class.oid
-  AND pg_class.relnamespace = pg_namespace.oid
-  AND pg_attribute.attrelid = pg_class.oid
-  AND pg_attribute.attnum = ANY (pg_index.indkey)
-  AND indisprimary
+  i.indrelid = c.oid
+  AND c.relnamespace = n.oid
+  AND a.attrelid = c.oid
+  AND a.attnum = ANY (i.indkey)
+  AND i.indisprimary
diff --git a/src/lib/sql/relationships.sql b/src/lib/sql/relationships.sql
@@ -1,9 +1,7 @@
 SELECT
-  (tc.table_schema || '.' || (tc.table_name)) AS source_table_id,
   tc.table_schema AS source_schema,
   tc.table_name AS source_table_name,
   kcu.column_name AS source_column_name,
-  (ccu.table_schema || '.' || (ccu.table_name)) AS target_table_id,
   ccu.table_schema AS target_table_schema,
   ccu.table_name AS target_table_name,
   ccu.column_name AS target_column_name,
diff --git a/src/lib/sql/schemas.sql b/src/lib/sql/schemas.sql
@@ -1,4 +1,5 @@
 SELECT
+  nsp.oid AS id,
   catalog_name,
   schema_name AS name,
   schema_owner AS owner,
@@ -8,3 +9,4 @@ SELECT
   sql_path
 FROM
   information_schema.schemata
+  JOIN pg_namespace nsp ON schema_name::text::regnamespace = nsp.oid
diff --git a/src/lib/sql/sequences.sql b/src/lib/sql/sequences.sql
@@ -1,23 +1,23 @@
+-- Adapted from the source for information_schema.sequences
 SELECT
-  table_schema,
-  table_name,
-  column_name,
-  sequence_name,
-  start_value,
-  minimum_value,
-  increment
-FROM
-  information_schema.columns
-  INNER JOIN information_schema.sequences ON (
-    table_schema = sequence_schema
-    AND pg_get_serial_sequence(
-      table_schema || '."' || table_name || '"',
-      column_name
-    ) = sequence_schema || '.' || sequence_name
-  )
-WHERE
-  sequence_schema = ?
-ORDER BY
-  table_schema,
-  table_name,
-  ordinal_position
+  c.oid AS id,
+  nc.nspname::information_schema.sql_identifier AS sequence_schema,
+  c.relname::information_schema.sql_identifier AS sequence_name,
+  s.seqstart::information_schema.character_data AS start_value,
+  s.seqmin::information_schema.character_data AS minimum_value,
+  s.seqmax::information_schema.character_data AS maximum_value,
+  s.seqincrement::information_schema.character_data AS increment
+FROM pg_namespace nc,
+  pg_class c,
+  pg_sequence s
+WHERE c.relnamespace = nc.oid AND c.relkind = 'S'::"char" AND NOT (EXISTS (
+  SELECT 1
+  FROM pg_depend
+  WHERE pg_depend.classid = 'pg_class'::regclass::oid
+  AND pg_depend.objid = c.oid
+  AND pg_depend.deptype = 'i'::"char"))
+  AND NOT pg_is_other_temp_schema(nc.oid)
+  AND c.oid = s.seqrelid
+  AND (pg_has_role(c.relowner, 'USAGE'::text)
+  OR has_sequence_privilege(c.oid, 'SELECT, UPDATE, USAGE'::text)
+)
diff --git a/src/lib/sql/tables.sql b/src/lib/sql/tables.sql
@@ -1,5 +1,5 @@
 SELECT
-  (table_schema || '.' || table_name) AS table_id,
+  c.oid AS id,
   table_catalog AS catalog,
   table_schema AS schema,
   table_name AS name,
@@ -30,6 +30,8 @@ SELECT
   autoanalyze_count :: bigint
 FROM
   information_schema.tables
+  JOIN pg_class c ON c.relnamespace = table_schema::text::regnamespace
+  AND c.relname = table_name::text
   LEFT JOIN pg_stat_user_tables ON pg_stat_user_tables.schemaname = tables.table_schema
   AND pg_stat_user_tables.relname = tables.table_name
 WHERE
diff --git a/src/lib/sql/types.sql b/src/lib/sql/types.sql
@@ -1,5 +1,5 @@
 SELECT
-  (n.nspname || '.' || t.typname) AS type_id,
+  t.oid AS id,
   t.typname AS name,
   n.nspname AS schema,
   pg_catalog.Format_type (t.oid, NULL) AS format,
diff --git a/src/lib/sql/views.sql b/src/lib/sql/views.sql
@@ -1,4 +1,5 @@
 SELECT
+  c.oid AS id,
   table_schema,
   table_name,
   check_option,
@@ -9,6 +10,5 @@ SELECT
   is_trigger_insertable_into
 FROM
   information_schema.views
-WHERE
-  table_schema = ?
-  AND table_schema NOT IN ('information_schema', 'pg_catalog')
+  INNER JOIN pg_class c ON table_schema::text::regnamespace = c.relnamespace
+  AND table_name::text = c.relname
diff --git a/test/integration/index.spec.js b/test/integration/index.spec.js
@@ -122,42 +122,43 @@ describe('/types', () => {
 describe('/tables', async () => {
   it('GET', async () => {
     const tables = await axios.get(`${URL}/tables`)
-    const datum = tables.data.find((x) => x.table_id == 'public.users')
-    const notIncluded = tables.data.find((x) => x.table_id == 'pg_catalog.pg_type')
+    const datum = tables.data.find((x) => `${x.schema}.${x.name}` === 'public.users')
+    const notIncluded = tables.data.find((x) => `${x.schema}.${x.name}` === 'pg_catalog.pg_type')
     assert.equal(tables.status, STATUS.SUCCESS)
     assert.equal(true, !!datum)
     assert.equal(true, !notIncluded)
   })
   it('should return the columns', async () => {
     const tables = await axios.get(`${URL}/tables`)
-    const datum = tables.data.find((x) => x.table_id == 'public.users')
-    const idColumn = datum.columns.find((x) => x.name == 'id')
-    const nameColumn = datum.columns.find((x) => x.name == 'name')
-    const statusColumn = datum.columns.find((x) => x.name == 'status')
+    const datum = tables.data.find((x) => `${x.schema}.${x.name}` === 'public.users')
+    const idColumn = datum.columns.find((x) => x.name === 'id')
+    const nameColumn = datum.columns.find((x) => x.name === 'name')
     assert.equal(true, !!datum)
     assert.equal(datum.columns.length > 0, true)
     assert.equal(datum.primary_keys.length > 0, true)
     assert.equal(idColumn.is_updatable, true)
     assert.equal(idColumn.is_identity, true)
     assert.equal(nameColumn.is_identity, false)
-    assert.equal(statusColumn.enums.length, 2)
   })
   it('should return the grants', async () => {
     const tables = await axios.get(`${URL}/tables`)
-    const datum = tables.data.find((x) => x.table_id == 'public.users')
+    const datum = tables.data.find((x) => `${x.schema}.${x.name}` === 'public.users')
     assert.equal(datum.grants.length > 0, true)
   })
   it('should return the relationships', async () => {
     const tables = await axios.get(`${URL}/tables`)
-    const datum = tables.data.find((x) => x.table_id == 'public.users')
+    const datum = tables.data.find((x) => `${x.schema}.${x.name}` === 'public.users')
     const relationships = datum.relationships
-    const relationship = relationships.find((x) => x.source_table_id == 'public.todos')
+    const relationship = relationships.find(
+      (x) => x.source_schema === 'public' && x.source_table_name === 'todos'
+    )
     assert.equal(relationships.length > 0, true)
-    assert.equal(true, relationship.target_table_id == 'public.users')
+    assert.equal(true, relationship.target_table_schema === 'public')
+    assert.equal(true, relationship.target_table_name === 'users')
   })
   it('GET with system tables', async () => {
     const res = await axios.get(`${URL}/tables?includeSystemSchemas=true`)
-    const included = res.data.find((x) => x.table_id == 'pg_catalog.pg_type')
+    const included = res.data.find((x) => `${x.schema}.${x.name}` === 'pg_catalog.pg_type')
     assert.equal(res.status, STATUS.SUCCESS)
     assert.equal(true, !!included)
   })
@@ -172,7 +173,7 @@ describe('/tables', async () => {
       primary_keys: ['id'],
     })
     const { data: tables } = await axios.get(`${URL}/tables`)
-    const test = tables.find((table) => table.table_id === 'public.test')
+    const test = tables.find((table) => `${table.schema}.${table.name}` === 'public.test')
     const id = test.columns.find((column) => column.name === 'id')
     const data = test.columns.find((column) => column.name === 'data')
     assert.equal(id.is_identity, true)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`SELECT`
	`2`	`+ e.oid AS id,`
`2`	`3`	`e.extname AS name,`
`3`	`4`	`e.extversion AS version,`
`4`	`5`	`n.nspname AS schema,`