@opengis/fastify-table 2.4.0 → 2.4.2

package/README.md

@@ -1,87 +1,87 @@
-# fastify-table
-
-<!-- ![alt text](https://cdn.softpro.ua/data/npm/admin/opengis-admin.png) -->
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table?style=plain)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![NPM last update](https://img.shields.io/npm/last-update/@opengis/fastify-table?style=plain)]()
-[![NPM downloads](https://img.shields.io/npm/dw/@opengis/fastify-table?style=plain)]()
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=plain)](http://standardjs.com/)
-
-This is a backend toolkit for database management and more.
-
-### Why fastify-table?
-
-- **Logger** - Monitoring user activity and system status.
-- **Redis cache** - Optimizes web page rendering for lightning-fast performance.
-- **Secure** - Ensures protection against XSS attacks in queries.
-- **SQL Migration** - Automatically adds all necessary tables to your project's database.
-
-
-### Features 
-
-- CRUD
-- cron
-- Logger
-- Redis
-- pg
-
----
-
-### Install
-
-```bash
-npm i @opengis/fastify-table
-```
-
-### Usage
-
-```js
-fastify.register(import('@opengis/fastify-table'), config);
-```
-
----
-
-### Documenation
-
-For a detailed understanding `fastify-table`, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/fastify-table/).
-
----
-
-### Technology stack
-
-<a href="https://fastify.dev/" target="_blank">
-<img src="https://img.shields.io/badge/Fastify-323330?style=for-the-badge&logo=fastify" /></a>
-
-<a href="https://www.postgresql.org/" target="_blank">
-<img src="https://img.shields.io/badge/PostgreSQL-323330?style=for-the-badge&logo=postgresql&logoColor=white" /></a>
-
-<a href="https://redis.io/" target="_blank">
-<img src="https://img.shields.io/badge/redis-323330.svg?&style=for-the-badge&logo=redis&logoColor=" /></a>
-
-<a href="https://www.npmjs.com/package/pino" target="_blank">
-<img src="https://img.shields.io/badge/pino-323330.svg?&style=for-the-badge&logo=pino&logoColor=" /></a>
-
----
-
-### Contribute
-
-Feel free to contact us through our website [SOFTPRO.UA](https://softpro.ua) or email <info@softpro.ua>
-
-- Report bugs
-- Share your ideas
-- Ask questions
-
-### Follow Us
-
-[Official site](https://softpro.ua)
-
-<p>
-  <a href="https://www.instagram.com/gissoftpro/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/instagram.png" alt="Softpro Instagram" title="oftpro Instagram"></a>&nbsp;&nbsp;
-  <a href="https://www.facebook.com/gissoftpro" target="_blank"><img src="https://cdn.softpro.ua/data/npm/facebook.png" alt="Softpro Facebook" title="Softpro Facebook"></a>&nbsp;&nbsp;
-  <a href="https://t.me/softprogis" target="_blank"><img src="https://cdn.softpro.ua/data/npm/telegram.png" alt="Softpro Telegram" title="Softpro Telegram"></a>&nbsp;&nbsp;
-  <a href="https://www.linkedin.com/in/softpro-ukraine-a8876b282/recent-activity/all/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/social/linkedin.png" alt="Softpro Linkedin" title="Softpro LinkedIn"></a>&nbsp;&nbsp;
-</p>
-
-### License
-
+# fastify-table
+
+<!-- ![alt text](https://cdn.softpro.ua/data/npm/admin/opengis-admin.png) -->
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table?style=plain)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![NPM last update](https://img.shields.io/npm/last-update/@opengis/fastify-table?style=plain)]()
+[![NPM downloads](https://img.shields.io/npm/dw/@opengis/fastify-table?style=plain)]()
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=plain)](http://standardjs.com/)
+
+This is a backend toolkit for database management and more.
+
+### Why fastify-table?
+
+- **Logger** - Monitoring user activity and system status.
+- **Redis cache** - Optimizes web page rendering for lightning-fast performance.
+- **Secure** - Ensures protection against XSS attacks in queries.
+- **SQL Migration** - Automatically adds all necessary tables to your project's database.
+
+
+### Features 
+
+- CRUD
+- cron
+- Logger
+- Redis
+- pg
+
+---
+
+### Install
+
+```bash
+npm i @opengis/fastify-table
+```
+
+### Usage
+
+```js
+fastify.register(import('@opengis/fastify-table'), config);
+```
+
+---
+
+### Documenation
+
+For a detailed understanding `fastify-table`, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/fastify-table/).
+
+---
+
+### Technology stack
+
+<a href="https://fastify.dev/" target="_blank">
+<img src="https://img.shields.io/badge/Fastify-323330?style=for-the-badge&logo=fastify" /></a>
+
+<a href="https://www.postgresql.org/" target="_blank">
+<img src="https://img.shields.io/badge/PostgreSQL-323330?style=for-the-badge&logo=postgresql&logoColor=white" /></a>
+
+<a href="https://redis.io/" target="_blank">
+<img src="https://img.shields.io/badge/redis-323330.svg?&style=for-the-badge&logo=redis&logoColor=" /></a>
+
+<a href="https://www.npmjs.com/package/pino" target="_blank">
+<img src="https://img.shields.io/badge/pino-323330.svg?&style=for-the-badge&logo=pino&logoColor=" /></a>
+
+---
+
+### Contribute
+
+Feel free to contact us through our website [SOFTPRO.UA](https://softpro.ua) or email <info@softpro.ua>
+
+- Report bugs
+- Share your ideas
+- Ask questions
+
+### Follow Us
+
+[Official site](https://softpro.ua)
+
+<p>
+  <a href="https://www.instagram.com/gissoftpro/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/instagram.png" alt="Softpro Instagram" title="oftpro Instagram"></a>&nbsp;&nbsp;
+  <a href="https://www.facebook.com/gissoftpro" target="_blank"><img src="https://cdn.softpro.ua/data/npm/facebook.png" alt="Softpro Facebook" title="Softpro Facebook"></a>&nbsp;&nbsp;
+  <a href="https://t.me/softprogis" target="_blank"><img src="https://cdn.softpro.ua/data/npm/telegram.png" alt="Softpro Telegram" title="Softpro Telegram"></a>&nbsp;&nbsp;
+  <a href="https://www.linkedin.com/in/softpro-ukraine-a8876b282/recent-activity/all/" target="_blank"><img src="https://cdn.softpro.ua/data/npm/social/linkedin.png" alt="Softpro Linkedin" title="Softpro LinkedIn"></a>&nbsp;&nbsp;
+</p>
+
+### License
+
 Copyright © SOFTPRO. All rights reserved.

package/dist/functions.js

@@ -31,7 +31,7 @@ export async function onListen1() {
             arr.map((item) => item?.ua).indexOf(el?.ua) === idx);
         const q = `insert into admin.menu(name, ord) values${uniqueList
             .map((el, i) => `('${el?.ua.replace(/'/g, "''")}', ${i}) `)
-            .join(",")}
+            .join(",")}
             on conflict (name) do update set ord=excluded.ord, enabled=true returning name, menu_id`;
         const { rows = [] } = uniqueList.length ? await client.query(q) : {};
         const menus = rows.reduce((acc, curr) => Object.assign(acc, {
@@ -55,25 +55,25 @@ export async function onListen1() {
             });
         }));
         // console.log(values)
-        const q1 = `insert into admin.routes(route_id, alias, title, menu_id, table_name, actions, access, query) 
+        const q1 = `insert into admin.routes(route_id, alias, title, menu_id, table_name, actions, access, query) 
             values ${values
             .filter((el) => el?.path)
-            .map((el) => `('${el.path}', ${el.table ? `'${el.table}'` : null}, 
+            .map((el) => `('${el.path}', ${el.table ? `'${el.table}'` : null}, 
             ${el.title || el.ua
             ? `'${(el.title || el.ua).replace(/'/g, "''")}'`
-            : null}, 
-            ${el.menuId ? `'${el.menuId}'` : null}, ${el.table1 ? `'${el.table1}'` : null}, 
-            ${el.actions?.length ? `'{ ${el.actions} }'::text[]` : null}, ${el.access ? `'${el.access}'` : null}, 
+            : null}, 
+            ${el.menuId ? `'${el.menuId}'` : null}, ${el.table1 ? `'${el.table1}'` : null}, 
+            ${el.actions?.length ? `'{ ${el.actions} }'::text[]` : null}, ${el.access ? `'${el.access}'` : null}, 
             ${el.query ? `'${el.query.replace(/'/g, "''")}'` : "'1=1'"})`)
-            .join(",")} 
-            on conflict (route_id) do update set menu_id=excluded.menu_id, alias=excluded.alias, title=excluded.title, enabled=true, query=excluded.query,
+            .join(",")} 
+            on conflict (route_id) do update set menu_id=excluded.menu_id, alias=excluded.alias, title=excluded.title, enabled=true, query=excluded.query,
             table_name=excluded.table_name, actions=excluded.actions, access=excluded.access returning route_id, table_name`;
         try {
             console.log("admin/hook routes sql start");
-            const { rowCount: menuCount } = await client.query(`delete from admin.menu 
+            const { rowCount: menuCount } = await client.query(`delete from admin.menu 
                 where not array[menu_id] <@ $1::text[] and menu_id not in (select menu_id from admin.routes)`, [rows.map((el) => el.menu_id)]);
             console.log("delete deprecated menus ok", menuCount);
-            const { rowCount: interfaceCount } = await client.query(`delete from admin.routes 
+            const { rowCount: interfaceCount } = await client.query(`delete from admin.routes 
                 where not array[route_id] <@ $1::text[] and route_id not in (select route_id from admin.role_access)`, [values.filter((el) => el?.path)]);
             console.log("delete deprecated interfaces ok", interfaceCount);
             const { rowCount } = values?.length ? await client.query(q1) : {};
@@ -134,9 +134,9 @@ export async function onListen2() {
                 return el.hash;
             }
             else if (type === "cls" && loadTemplate?.length && el.update) {
-                clsQuery.push(`insert into admin.cls(name,type, module,hash) values('${name}','json', '${module?.replace(/'/g, "''")}','${el.hash}'); 
-            insert into admin.cls(code,name,parent,icon,color,data) 
-            select value->>'id',value->>'text','${name}',value->>'icon',value->>'color',value->>'data' 
+                clsQuery.push(`insert into admin.cls(name,type, module,hash) values('${name}','json', '${module?.replace(/'/g, "''")}','${el.hash}'); 
+            insert into admin.cls(code,name,parent,icon,color,data) 
+            select value->>'id',value->>'text','${name}',value->>'icon',value->>'color',value->>'data' 
             from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json) on conflict (code,parent) do update set color=excluded.color;`);
                 if (config.trace)
                     console.log(name, type, "insert fresh cls");
@@ -224,7 +224,7 @@ export async function afterTable({ table, res = {}, payload: rows = [], user = {
         !client?.pk?.["admin.custom_column"])
         return;
     // admin.custom_column - user column data
-    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
+    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
       where _table and entity=$1 and uid=$2`, [table, uid]);
     const extraColumnList = properties.map((row) => ({
         id: row.column_id,
@@ -238,7 +238,7 @@ export async function afterTable({ table, res = {}, payload: rows = [], user = {
     if (Array.isArray(res?.columns) && res?.columns?.length) {
         extraColumnList.forEach((col) => res.columns.push(col));
     }
-    const { rows: extraData = [] } = await client.query(`select object_id, json_object_agg( property_id, coalesce(value_date::text,value_text) ) as extra from crm.extra_data 
+    const { rows: extraData = [] } = await client.query(`select object_id, json_object_agg( property_id, coalesce(value_date::text,value_text) ) as extra from crm.extra_data 
       where property_entity=$1 and property_id=any($2) and object_id=any($3) group by object_id`, [
         table,
         extraColumnList?.map((el) => el.id),
@@ -310,7 +310,7 @@ export async function afterTemplate({ name, type, payload: data = {}, user = {},
             json: 1,
         })) ||
         {}; // add?
-    const { rows: properties = [] } = await client.query(`select name, title, format, data from admin.custom_column 
+    const { rows: properties = [] } = await client.query(`select name, title, format, data from admin.custom_column 
       where entity=$1 and uid=$2`, [table || name, uid]);
     await Promise.all(properties.map(async (el) => {
         const clsData = el.data
@@ -347,13 +347,13 @@ export async function afterUpdate({ table, body = {}, payload: res = {}, user =
         return null;
     const pk = client?.pk?.[loadTable?.table || table];
     const id = res[pk];
-    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
+    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
       where entity=$1 and uid=$2`, [table, uid]);
     if (!id || !properties?.length || !client.pk?.["crm.extra_data"])
         return null;
     const q = `delete from crm.extra_data where property_entity='${table}' and object_id='${id}';${properties
         .filter((el) => Object.keys(body).includes(el.name))
-        .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === "date" ? "value_date" : "value_text"})
+        .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === "date" ? "value_date" : "value_text"})
       select '${el.column_id}', '${el.name}', '${table}', '${id}', ${el.format?.toLowerCase() === "date"
         ? `'${body[el.name]}'::timestamp without time zone`
         : `'${body[el.name]}'::text`}`)
@@ -375,13 +375,13 @@ export async function afterInsert({ table, body, payload: res = {}, user = {}, }
         return null;
     const pk = client?.pk?.[loadTable?.table || table];
     const id = res.rows?.[0]?.[pk];
-    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
+    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
       where entity=$1 and uid=$2`, [table, uid]);
     if (!id || !properties?.length)
         return null;
     const q = properties
         .filter((el) => Object.keys(body).includes(el.name))
-        .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === "date" ? "value_date" : "value_text"})
+        .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === "date" ? "value_date" : "value_text"})
       select '${el.column_id}', '${el.name}', '${table}', '${id}', ${el.format?.toLowerCase() === "date"
         ? `'${body[el.name]}'::timestamp without time zone`
         : `'${body[el.name]}'::text`}`)

package/dist/module/core/cls/constraint_action.json

@@ -1,10 +1,10 @@
-[
-    {
-        "id": "a",
-        "text": "NO ACTION"
-    },
-    {
-        "id": "c",
-        "text": "CASCADE"
-    }
+[
+    {
+        "id": "a",
+        "text": "NO ACTION"
+    },
+    {
+        "id": "c",
+        "text": "CASCADE"
+    }
 ]

package/dist/module/core/cls/constraint_matchtype.json

@@ -1,6 +1,6 @@
-[
-    {
-        "id": "s",
-        "text": "SIMPLE"
-    }
+[
+    {
+        "id": "s",
+        "text": "SIMPLE"
+    }
 ]

package/dist/module/core/cls/constraint_type_full.json

@@ -1,18 +1,18 @@
-[
-    {
-        "id": "u",
-        "text": "UNIQUE"
-    },
-    {
-        "id": "p",
-        "text": "PRIMARY KEY"
-    },
-    {
-        "id": "f",
-        "text": "FOREIGN KEY"
-    },
-    {
-        "id": "c",
-        "text": "CHECK"
-    }
+[
+    {
+        "id": "u",
+        "text": "UNIQUE"
+    },
+    {
+        "id": "p",
+        "text": "PRIMARY KEY"
+    },
+    {
+        "id": "f",
+        "text": "FOREIGN KEY"
+    },
+    {
+        "id": "c",
+        "text": "CHECK"
+    }
 ]

package/dist/module/core/cls/core.user_type.json

@@ -1,14 +1,14 @@
-[
-    {
-        "id": "regular",
-        "text": "Regular"
-    },
-    {
-        "id": "viewer",
-        "text": "Viewer"
-    },
-    {
-        "id": "admin",
-        "text": "Admin"
-    }
+[
+    {
+        "id": "regular",
+        "text": "Regular"
+    },
+    {
+        "id": "viewer",
+        "text": "Viewer"
+    },
+    {
+        "id": "admin",
+        "text": "Admin"
+    }
 ]

package/dist/module/core/pt/schemaItem.pt.hbs

@@ -1,18 +1,18 @@
--- schema: {{nspname}}
-
-CREATE schema if not exists {{nspname}};
-
-{{#each rows}}
--- {{{description}}}
-
-CREATE TABLE if not exists {{nspname}}.{{relname}}
-(
-  {{#each columns}}
-  {{column_name}} {{data_type}} {{#unless is_nullable}}NOT NULL{{/unless}}{{#if column_default}}DEFAULT {{column_default}}{{/if}}{{#ifCond @index '!=' (_math ../columns.length '-' 1)}},{{/ifCond}} -- {{{coalesce description '-'}}}
-  {{/each}}{{#if constraints.length}},{{/if}}
-  {{#each constraints}}
-  CONSTRAINT {{constraint_name}} {{#ifCond constraint_type '==' 'c'}} {{check_definition}} {{/ifCond}} {{#ifCond constraint_type '==' 'f'}}FOREIGN KEY ({{foreign_column}}) REFERENCES {{foreign_table}} ({{foreign_column}}) MATCH {{select confmatchtype data="constraint_matchtype"}} ON UPDATE {{select confupdtype data="constraint_action"}} ON DELETE {{select confdeltype data="constraint_action"}}{{^}}{{#ifCond constraint_type '!=' 'c'}}{{select constraint_type data="constraint_type_full"}} ({{column_name}}){{/ifCond}}{{/ifCond}}{{#ifCond @index '!=' (_math ../constraints.length '-' 1)}},{{/ifCond}}
-  {{/each}}
-);
-
+-- schema: {{nspname}}
+
+CREATE schema if not exists {{nspname}};
+
+{{#each rows}}
+-- {{{description}}}
+
+CREATE TABLE if not exists {{nspname}}.{{relname}}
+(
+  {{#each columns}}
+  {{column_name}} {{data_type}} {{#unless is_nullable}}NOT NULL{{/unless}}{{#if column_default}}DEFAULT {{column_default}}{{/if}}{{#ifCond @index '!=' (_math ../columns.length '-' 1)}},{{/ifCond}} -- {{{coalesce description '-'}}}
+  {{/each}}{{#if constraints.length}},{{/if}}
+  {{#each constraints}}
+  CONSTRAINT {{constraint_name}} {{#ifCond constraint_type '==' 'c'}} {{check_definition}} {{/ifCond}} {{#ifCond constraint_type '==' 'f'}}FOREIGN KEY ({{foreign_column}}) REFERENCES {{foreign_table}} ({{foreign_column}}) MATCH {{select confmatchtype data="constraint_matchtype"}} ON UPDATE {{select confupdtype data="constraint_action"}} ON DELETE {{select confdeltype data="constraint_action"}}{{^}}{{#ifCond constraint_type '!=' 'c'}}{{select constraint_type data="constraint_type_full"}} ({{column_name}}){{/ifCond}}{{/ifCond}}{{#ifCond @index '!=' (_math ../constraints.length '-' 1)}},{{/ifCond}}
+  {{/each}}
+);
+
 {{/each}}

package/dist/script/adduser

@@ -1,15 +1,15 @@
-#!/bin/bash
-rootDir=`echo $(dirname "$0")`
-echo "$rootDir/passwd"
-
-if [ -e "$rootDir/../passwd" ]
-then
-    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
-    echo "$1:$password"
-    echo "$1:$password" >> "$rootDir/../passwd"
-else
-    > passwd
-    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
-    echo "$1:$password"
-    echo "$1:$password" > "$rootDir/../passwd"
+#!/bin/bash
+rootDir=`echo $(dirname "$0")`
+echo "$rootDir/passwd"
+
+if [ -e "$rootDir/../passwd" ]
+then
+    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
+    echo "$1:$password"
+    echo "$1:$password" >> "$rootDir/../passwd"
+else
+    > passwd
+    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
+    echo "$1:$password"
+    echo "$1:$password" > "$rootDir/../passwd"
 fi

package/dist/script/dump.js

@@ -79,57 +79,57 @@ async function saveFile(data, filename) {
 async function schemaItem({ pg, table, schema, debug, }) {
     if (!schema && !table)
         return new Error("param schema is required");
-    const { rows: schemaInfo } = await pg.query(`select c.oid,relname,nspname,obj_description(c.oid) as description,
-    (
-      select json_agg(row_to_json(q))
-      from (
-        select
-          column_name,
-          case 
-            when data_type='USER-DEFINED' AND udt_name='geometry' THEN 'geometry' 
-            when data_type='ARRAY' AND udt_name='_text'  THEN 'text[]' 
-            when data_type='ARRAY' AND udt_name='_int4'  THEN 'integer[]' 
-            else data_type 
-          end as data_type,
-          ordinal_position,
-          column_default,
-          is_nullable,
-          case 
-            when column_name='uid' then 'ідентифікатор автора запису в БД'
-            when column_name='cdate' then 'Дата створення запису в БД'
-            when column_name='editor_id' then 'Ідентифікатор автора, який останій вніс зміни в запис'
-            when column_name='editor_date' then 'Час останії зміни в записі'
-            when column_name='files' then 'Системна колонка'
-            when column_name='doc_status' then 'Статус документа'
-            when column_name='reg_status' then 'Статус реєстрації'
-            when column_name='obj_version' then 'Версія запису'
-          else col_description(a.attrelid,ordinal_position) 
-          end as description
-        from information_schema.columns col
-        LEFT JOIN pg_attribute a ON col.column_name=a.attname and c.oid = a.attrelid
-        where col.table_schema=nspname and col.table_name=relname
-      )q
-    ) as columns
-    from pg_class c
-    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-    where ${table ? `nspname||'.'||relname='${table}'` : `'${schema}'=nspname`} and relam=2
+    const { rows: schemaInfo } = await pg.query(`select c.oid,relname,nspname,obj_description(c.oid) as description,
+    (
+      select json_agg(row_to_json(q))
+      from (
+        select
+          column_name,
+          case 
+            when data_type='USER-DEFINED' AND udt_name='geometry' THEN 'geometry' 
+            when data_type='ARRAY' AND udt_name='_text'  THEN 'text[]' 
+            when data_type='ARRAY' AND udt_name='_int4'  THEN 'integer[]' 
+            else data_type 
+          end as data_type,
+          ordinal_position,
+          column_default,
+          is_nullable,
+          case 
+            when column_name='uid' then 'ідентифікатор автора запису в БД'
+            when column_name='cdate' then 'Дата створення запису в БД'
+            when column_name='editor_id' then 'Ідентифікатор автора, який останій вніс зміни в запис'
+            when column_name='editor_date' then 'Час останії зміни в записі'
+            when column_name='files' then 'Системна колонка'
+            when column_name='doc_status' then 'Статус документа'
+            when column_name='reg_status' then 'Статус реєстрації'
+            when column_name='obj_version' then 'Версія запису'
+          else col_description(a.attrelid,ordinal_position) 
+          end as description
+        from information_schema.columns col
+        LEFT JOIN pg_attribute a ON col.column_name=a.attname and c.oid = a.attrelid
+        where col.table_schema=nspname and col.table_name=relname
+      )q
+    ) as columns
+    from pg_class c
+    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+    where ${table ? `nspname||'.'||relname='${table}'` : `'${schema}'=nspname`} and relam=2
     order by nspname,relname`);
     if (!schemaInfo?.length)
         throw new Error("invalid params");
-    const { rows: constraints } = await pg.query(`select con.conrelid::regclass as constraint_table, a.column_name,
-    con.conname as constraint_name,contype as constraint_type, con.confrelid::regclass as foreign_table, 
-    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column,
-    case when contype='c' then pg_get_constraintdef(con.oid, true) else null end AS check_definition from pg_constraint con
-    left join pg_class c ON c.oid = con.conrelid              
-    left join pg_namespace n ON n.oid = c.relnamespace
-    left join lateral (
-      select string_agg(a.attname,',') as column_name from pg_attribute a 
-        where con.conrelid = a.attrelid and a.attnum = any(con.conkey) limit 1
-    )a on 1=1
-    left join lateral (
-      select column_name from information_schema.constraint_column_usage u 
-        where conname=u.constraint_name limit 1
-    )u on 1=1
+    const { rows: constraints } = await pg.query(`select con.conrelid::regclass as constraint_table, a.column_name,
+    con.conname as constraint_name,contype as constraint_type, con.confrelid::regclass as foreign_table, 
+    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column,
+    case when contype='c' then pg_get_constraintdef(con.oid, true) else null end AS check_definition from pg_constraint con
+    left join pg_class c ON c.oid = con.conrelid              
+    left join pg_namespace n ON n.oid = c.relnamespace
+    left join lateral (
+      select string_agg(a.attname,',') as column_name from pg_attribute a 
+        where con.conrelid = a.attrelid and a.attnum = any(con.conkey) limit 1
+    )a on 1=1
+    left join lateral (
+      select column_name from information_schema.constraint_column_usage u 
+        where conname=u.constraint_name limit 1
+    )u on 1=1
     where ${table ? `conrelid::regclass::text = '${table}'` : `nspname = '${schema}'`}`);
     // add table constraints, mermaid
     schemaInfo?.forEach((row) => {