refactor: tidy up sql templates

Author: soedirgo

src/lib/sql/functions.sql

@@ -1,16 +1,16 @@
-select
-    p.oid :: int8 as id,
-    n.nspname as schema,
-    p.proname as name,
-    l.lanname as language,
-    case
-        when l.lanname = 'internal' then p.prosrc
-        else pg_get_functiondef(p.oid)
-    end as definition,
-    pg_get_function_arguments(p.oid) as argument_types,
-    t.typname as return_type
-from
-    pg_proc p
-    left join pg_namespace n on p.pronamespace = n.oid
-    left join pg_language l on p.prolang = l.oid
-    left join pg_type t on t.oid = p.prorettype
+SELECT
+  p.oid :: int8 AS id,
+  n.nspname AS schema,
+  p.proname AS name,
+  l.lanname AS language,
+  CASE
+    WHEN l.lanname = 'internal' THEN p.prosrc
+    ELSE pg_get_functiondef(p.oid)
+  END AS definition,
+  pg_get_function_arguments(p.oid) AS argument_types,
+  t.typname AS return_type
+FROM
+  pg_proc p
+  LEFT JOIN pg_namespace n ON p.pronamespace = n.oid
+  LEFT JOIN pg_language l ON p.prolang = l.oid
+  LEFT JOIN pg_type t ON t.oid = p.prorettype

src/lib/sql/index.ts

@@ -1,19 +1,17 @@
-import * as fs from 'fs'
-import * as path from 'path'
+import { readFileSync } from 'fs'
+import { resolve } from 'path'
 
-export = {
-  columns: fs.readFileSync(path.join(__dirname, '/columns.sql')).toString(),
-  config: fs.readFileSync(path.join(__dirname, '/config.sql')).toString(),
-  extensions: fs.readFileSync(path.join(__dirname, '/extensions.sql')).toString(),
-  functions: fs.readFileSync(path.join(__dirname, '/functions.sql')).toString(),
-  grants: fs.readFileSync(path.join(__dirname, '/grants.sql')).toString(),
-  policies: fs.readFileSync(path.join(__dirname, '/policies.sql')).toString(),
-  primary_keys: fs.readFileSync(path.join(__dirname, '/primary_keys.sql')).toString(),
-  publications: fs.readFileSync(path.join(__dirname, '/publications.sql')).toString(),
-  relationships: fs.readFileSync(path.join(__dirname, '/relationships.sql')).toString(),
-  roles: fs.readFileSync(path.join(__dirname, '/roles.sql')).toString(),
-  schemas: fs.readFileSync(path.join(__dirname, '/schemas.sql')).toString(),
-  tables: fs.readFileSync(path.join(__dirname, '/tables.sql')).toString(),
-  types: fs.readFileSync(path.join(__dirname, '/types.sql')).toString(),
-  version: fs.readFileSync(path.join(__dirname, '/version.sql')).toString(),
-}
+export const columnsSql = readFileSync(resolve(__dirname, 'columns.sql'), 'utf-8')
+export const configSql = readFileSync(resolve(__dirname, 'config.sql'), 'utf-8')
+export const extensionsSql = readFileSync(resolve(__dirname, 'extensions.sql'), 'utf-8')
+export const functionsSql = readFileSync(resolve(__dirname, 'functions.sql'), 'utf-8')
+export const grantsSql = readFileSync(resolve(__dirname, 'grants.sql'), 'utf-8')
+export const policiesSql = readFileSync(resolve(__dirname, 'policies.sql'), 'utf-8')
+export const primaryKeysSql = readFileSync(resolve(__dirname, 'primary_keys.sql'), 'utf-8')
+export const publicationsSql = readFileSync(resolve(__dirname, 'publications.sql'), 'utf-8')
+export const relationshipsSql = readFileSync(resolve(__dirname, 'relationships.sql'), 'utf-8')
+export const rolesSql = readFileSync(resolve(__dirname, 'roles.sql'), 'utf-8')
+export const schemasSql = readFileSync(resolve(__dirname, 'schemas.sql'), 'utf-8')
+export const tablesSql = readFileSync(resolve(__dirname, 'tables.sql'), 'utf-8')
+export const typesSql = readFileSync(resolve(__dirname, 'types.sql'), 'utf-8')
+export const versionSql = readFileSync(resolve(__dirname, 'version.sql'), 'utf-8')

src/lib/sql/policies.sql

@@ -1,5 +1,5 @@
-select
-  pol.oid :: int8 as id,
+SELECT
+  pol.oid :: int8 AS id,
   n.nspname AS schema,
   c.relname AS table,
   c.oid :: int8 AS table_id,

src/lib/sql/roles.sql

@@ -9,29 +9,19 @@ SELECT
   rolcanlogin AS can_login,
   rolreplication AS is_replication_role,
   rolbypassrls AS can_bypass_rls,
-  active_connections,
-  CASE WHEN rolconnlimit = -1 THEN max_db_connections :: int4
+  (
+    SELECT
+      COUNT(*)
+    FROM
+      pg_stat_activity
+    WHERE
+      pg_roles.rolname = pg_stat_activity.usename
+  ) AS active_connections,
+  CASE WHEN rolconnlimit = -1 THEN current_setting('max_connections') :: int8
        ELSE rolconnlimit
   END AS connection_limit,
   rolpassword AS password,
   rolvaliduntil AS valid_until,
   rolconfig AS config
 FROM
-  pg_catalog.pg_roles
-  INNER JOIN LATERAL (
-    SELECT
-      count(*) AS active_connections
-    FROM
-      pg_stat_activity
-    WHERE
-      state = 'active'
-      AND pg_roles.rolname = pg_stat_activity.usename
-  ) AS active_connections ON 1 = 1
-  INNER JOIN LATERAL (
-    SELECT
-      setting AS max_db_connections
-    FROM
-      pg_settings
-    WHERE
-      name = 'max_connections'
-  ) AS max_db_connections ON 1 = 1
+  pg_roles

src/lib/sql/types.sql

@@ -2,31 +2,31 @@ SELECT
   t.oid :: int8 AS id,
   t.typname AS name,
   n.nspname AS schema,
-  pg_catalog.Format_type (t.oid, NULL) AS format,
-  pg_catalog.obj_description (t.oid, 'pg_type') AS description,
+  format_type (t.oid, NULL) AS format,
   array_to_json(
     array(
       SELECT
         e.enumlabel
       FROM
-        pg_catalog.pg_enum e
+        pg_enum e
       WHERE
         e.enumtypid = t.oid
       ORDER BY
         e.oid
     )
-  ) AS enums
+  ) AS enums,
+  obj_description (t.oid, 'pg_type') AS comment
 FROM
-  pg_catalog.pg_type t
-  LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
+  pg_type t
+  LEFT JOIN pg_namespace n ON n.oid = t.typnamespace
 WHERE
   (
     t.typrelid = 0
     OR (
       SELECT
         c.relkind = 'c'
       FROM
-        pg_catalog.pg_class c
+        pg_class c
       WHERE
         c.oid = t.typrelid
     )
@@ -35,7 +35,7 @@ WHERE
     SELECT
       1
     FROM
-      pg_catalog.pg_type el
+      pg_type el
     WHERE
       el.oid = t.typelem
       AND el.typarray = t.oid

src/lib/sql/version.sql

@@ -1,27 +1,10 @@
 SELECT
-  *
-FROM
+  version(),
+  current_setting('server_version_num') :: int8 AS version_number,
   (
     SELECT
-      version()
-  ) version,
-  (
-    SELECT
-      current_setting('server_version_num') AS version_number
-  ) version_number,
-  (
-    SELECT
-      count(pid) AS active_connections
+      COUNT(*) AS active_connections
     FROM
       pg_stat_activity
-    WHERE
-      state = 'active'
-  ) active_connections,
-  (
-    SELECT
-      setting AS max_connections
-    FROM
-      pg_settings
-    WHERE
-      name = 'max_connections'
-  ) max_connections
+  ) AS active_connections,
+  current_setting('max_connections') :: int8 AS max_connections