@opengis/fastify-table 1.1.23 → 1.1.25

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.1.25 - 08.10.2024
+
+- add migrations
+
 ## 1.1.23 - 03.10.2024
 
 - add user API and unit tests

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.23",
+  "version": "1.1.25",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/pg/funcs/getPGAsync.js

@@ -0,0 +1,30 @@
+import pg from 'pg';
+import config from '../../config.js';
+import pgClients from '../pgClients.js';
+import init from './init.js';
+
+async function getPGAsync(param) {
+  const {
+    user, password, host, port, db, database, name: origin, funcs,
+  } = typeof param === 'string'? { db:param } : param || {};
+  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
+  const name = origin || db || database || param || 'client';
+  
+  if (pgClients[name]) return pgClients[name];
+
+  const dbConfig = {
+    user: user || config.pg?.user,
+    password: password || config.pg?.password,
+    host: host || config.pg?.host,
+    port: port || config.pg?.port,
+    database: db || database || config.pg?.db || config.pg?.database,
+  };
+
+  pgClients[name] = new pg.Pool(dbConfig);
+  
+  await init(pgClients[name]);  
+  
+  return pgClients[name];
+}
+
+export default getPGAsync;

package/server/migrations/cls.sql

@@ -0,0 +1,39 @@
+create schema if not exists admin;
+
+CREATE TABLE if not exists admin.cls();
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS clsid text;
+ALTER TABLE admin.cls DROP CONSTRAINT IF EXISTS admin_cls_pkey;
+ALTER TABLE admin.cls DROP CONSTRAINT IF EXISTS admin_cls_unique;
+
+ALTER TABLE admin.cls ALTER COLUMN clsid SET NOT NULL; 
+ALTER TABLE admin.cls ALTER COLUMN clsid SET DEFAULT next_id();
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS name text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS data text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS type text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS code text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS parent text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS ua text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS en text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS module text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS files json;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
+ALTER TABLE admin.cls ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE admin.cls ALTER COLUMN uid SET NOT NULL;
+ALTER TABLE admin.cls ALTER COLUMN uid SET DEFAULT '1'::text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS icon text;
+ALTER TABLE admin.cls ADD COLUMN IF NOT EXISTS color text;
+
+ALTER TABLE admin.cls ADD CONSTRAINT admin_cls_pkey PRIMARY KEY (clsid);
+ALTER TABLE admin.cls ADD CONSTRAINT admin_cls_unique UNIQUE (code, parent);
+
+COMMENT ON COLUMN admin.cls.name IS 'Назва';
+COMMENT ON COLUMN admin.cls.type IS 'Тип';
+COMMENT ON COLUMN admin.cls.data IS 'SQL';
+COMMENT ON COLUMN admin.cls.code IS 'Код';
+COMMENT ON COLUMN admin.cls.parent IS 'Назва батьківського об''єкту';
+COMMENT ON COLUMN admin.cls.module IS 'Модуль';
+COMMENT ON COLUMN admin.cls.icon IS 'Іконка';
+COMMENT ON COLUMN admin.cls.color IS 'Колір';

package/server/migrations/properties.sql

@@ -55,4 +55,67 @@ ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS files json;
 ALTER TABLE admin.user_properties ADD CONSTRAINT admin_user_properties_property_id_pkey PRIMARY KEY(property_id);
 ALTER TABLE admin.user_properties ADD CONSTRAINT user_properties_key_uid_unique UNIQUE (property_key,property_entity,uid);
 
-COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';
+COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';
+
+-- DROP TABLE admin.table_properties;
+CREATE TABLE IF NOT EXISTS admin.table_properties();
+ALTER TABLE admin.table_properties DROP CONSTRAINT IF EXISTS admin_table_properties_property_id_pkey cascade;
+alter table admin.table_properties drop constraint if exists table_properties_key_type_entity_uid_unique;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_key text;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_type text;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_entity text;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_title text;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_format text;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS property_data text;
+
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
+ALTER TABLE admin.table_properties ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE admin.table_properties ADD CONSTRAINT admin_table_properties_property_id_pkey PRIMARY KEY(property_id);
+ALTER TABLE admin.table_properties ADD CONSTRAINT table_properties_key_type_entity_uid_unique UNIQUE (property_key,property_type,property_entity,uid);
+
+COMMENT ON TABLE admin.table_properties IS 'Налаштування таблиць користувача';
+COMMENT ON COLUMN admin.table_properties.property_key IS 'Ключ';
+COMMENT ON COLUMN admin.table_properties.property_type IS 'Тип (колонка/фільтр)';
+COMMENT ON COLUMN admin.table_properties.property_entity IS 'Сутність';
+COMMENT ON COLUMN admin.table_properties.property_title IS 'Назва';
+COMMENT ON COLUMN admin.table_properties.property_format IS 'Формат';
+COMMENT ON COLUMN admin.table_properties.property_data IS 'Класифікатор';
+
+CREATE TABLE if not exists setting.extra_data();
+ALTER TABLE setting.extra_data DROP CONSTRAINT IF EXISTS setting_extra_data_pkey;
+ALTER TABLE setting.extra_data DROP CONSTRAINT IF EXISTS setting_extra_data_property_id_fkey;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS extra_data_id text;
+ALTER TABLE setting.extra_data ALTER COLUMN extra_data_id SET NOT NULL;
+ALTER TABLE setting.extra_data ALTER COLUMN extra_data_id SET DEFAULT next_id();
+
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_id text;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS property_entity text;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS object_id text;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS value_json json;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE setting.extra_data ALTER COLUMN uid SET DEFAULT '1'::text;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
+ALTER TABLE setting.extra_data ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE setting.extra_data ADD COLUMN IF NOT EXISTS files json;
+ALTER TABLE setting.extra_data ADD CONSTRAINT setting_extra_data_pkey PRIMARY KEY (extra_data_id);
+ALTER TABLE setting.extra_data ADD CONSTRAINT setting_extra_data_property_id_fkey FOREIGN KEY (property_id) REFERENCES admin.table_properties (property_id) MATCH SIMPLE;
+
+COMMENT ON TABLE setting.extra_data IS 'Значення користувацьких полів';
+COMMENT ON COLUMN setting.extra_data.property_id IS 'ID поля користувача';
+COMMENT ON COLUMN setting.extra_data.property_entity IS 'Таблиця';
+COMMENT ON COLUMN setting.extra_data.object_id IS 'Ідентифікатор об''єкту';
+COMMENT ON COLUMN setting.extra_data.value_json IS 'Значення';
+COMMENT ON COLUMN setting.extra_data.uid IS 'ID користувача';
+
+CREATE INDEX IF NOT EXISTS setting_extra_data_cdate_btree_idx ON setting.extra_data USING btree (cdate);
+CREATE INDEX IF NOT EXISTS setting_extra_data_property_id_btree_idx ON setting.extra_data USING btree (property_id COLLATE pg_catalog."default");
+CREATE INDEX IF NOT EXISTS setting_extra_data_property_entity_btree_idx ON setting.extra_data USING btree (property_entity COLLATE pg_catalog."default");
+CREATE INDEX IF NOT EXISTS setting_extra_data_object_id_btree_idx ON setting.extra_data USING btree (object_id COLLATE pg_catalog."default");

package/user/controllers/user.cls.js

@@ -15,14 +15,14 @@ export default async function userCls(req) {
   case when type='json' then (
       ${params?.id
     ? `(with recursive rows as (
-        select user_clsid, name, code, icon, color, parent
+        select user_clsid, code as id, name as text, icon, color, parent
         from admin.user_cls a
         where name=u.name
         union all
-        select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
+        select a.user_clsid, a.code, a.name, a.icon, a.color, a.parent
         from admin.user_cls a
-        join rows b on a.parent=b.name
-      ) select json_agg(row_to_json(q)) from rows q where name<>u.name
+        join rows b on a.parent=b.text
+      ) select json_agg(row_to_json(q)) from rows q where text<>u.name
      )`
     : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
       case when type='sql' then data else null end as sql from admin.user_cls u

package/utils.js

@@ -9,6 +9,7 @@ import metaFormat from './table/funcs/metaFormat/index.js';
 import autoIndex from './pg/funcs/autoIndex.js';
 
 import getPG from './pg/funcs/getPG.js';
+import getPGAsync from './pg/funcs/getPGAsync.js';
 import initPG from './pg/funcs/init.js';
 import pgClients from './pg/pgClients.js';
 import getRedis from './redis/funcs/getRedis.js';
@@ -41,6 +42,7 @@ export {
   autoIndex,
   addTemplateDir,
   getPG,
+  getPGAsync,
   initPG,
   pgClients,
   dataInsert,