@opengis/fastify-table 1.1.78 → 1.1.79

package/index.js

@@ -1,76 +1,76 @@
-import path from 'node:path';
-import fp from 'fastify-plugin';
-import { fileURLToPath } from 'node:url';
-
-import config from './config.js';
-
-// plugins
-import cronPlugin from './server/plugins/cron/index.js';
-import crudPlugin from './server/plugins/crud/index.js';
-// hook, logger, migration - utils only
-import pgPlugin from './server/plugins/pg/index.js';
-import policyPlugin from './server/plugins/policy/index.js';
-import redisPlugin from './server/plugins/redis/index.js';
-import tablePlugin from './server/plugins/table/index.js';
-import utilPlugin from './server/plugins/util/index.js';
-import loggerPlugin from './server/plugins/logger/index.js';
-
-// routes
-import cronRoutes from './server/routes/cron/index.js';
-import crudRoutes from './server/routes/crud/index.js';
-import loggerRoutes from './server/routes/logger/index.js';
-import propertiesRoutes from './server/routes/properties/index.js';
-import tableRoutes from './server/routes/table/index.js';
-import utilRoutes from './server/routes/util/index.js';
-
-import {
-  addTemplateDir, execMigrations,
-} from './utils.js';
-
-async function plugin(fastify, opt) {
-  config.pg = opt.pg;
-  config.redis = opt.redis;
-  config.root = opt.root;
-  config.mapServerRoot = opt.mapServerRoot;
-
-  // independent npm start / unit test
-  if (!fastify.config) {
-    fastify.decorate('config', config);
-  }
-
-  fastify.register(import('@fastify/sensible'), {
-    errorHandler: false,
-  });
-
-  fastify.register(import('@fastify/url-data'), {
-    errorHandler: false,
-  });
-
-  fastify.register(import('@opengis/fastify-hb'));
-
-  execMigrations().catch(err => console.log(err));
-
-  // plugins / utils / funcs
-  policyPlugin(fastify);
-  redisPlugin(fastify);
-  await pgPlugin(fastify, opt);
-  tablePlugin(fastify, opt);
-  crudPlugin(fastify, opt);
-  utilPlugin(fastify, opt);
-  cronPlugin(fastify, opt);
-  loggerPlugin(fastify, opt);
-
-  // routes / api
-  cronRoutes(fastify, opt);
-  crudRoutes(fastify, opt);
-  loggerRoutes(fastify, opt);
-  propertiesRoutes(fastify, opt);
-  tableRoutes(fastify, opt);
-  utilRoutes(fastify, opt);
-
-  // core templates && cls
-  const filename = fileURLToPath(import.meta.url);
-  const cwd = path.dirname(filename);
-  addTemplateDir(path.join(cwd, 'module/core'));
-}
-export default fp(plugin);
+import path from 'node:path';
+import fp from 'fastify-plugin';
+import { fileURLToPath } from 'node:url';
+
+import config from './config.js';
+
+// plugins
+import cronPlugin from './server/plugins/cron/index.js';
+import crudPlugin from './server/plugins/crud/index.js';
+// hook, logger, migration - utils only
+import pgPlugin from './server/plugins/pg/index.js';
+import policyPlugin from './server/plugins/policy/index.js';
+import redisPlugin from './server/plugins/redis/index.js';
+import tablePlugin from './server/plugins/table/index.js';
+import utilPlugin from './server/plugins/util/index.js';
+import loggerPlugin from './server/plugins/logger/index.js';
+
+// routes
+import cronRoutes from './server/routes/cron/index.js';
+import crudRoutes from './server/routes/crud/index.js';
+import loggerRoutes from './server/routes/logger/index.js';
+import propertiesRoutes from './server/routes/properties/index.js';
+import tableRoutes from './server/routes/table/index.js';
+import utilRoutes from './server/routes/util/index.js';
+
+import {
+  addTemplateDir, execMigrations,
+} from './utils.js';
+
+async function plugin(fastify, opt) {
+  config.pg = opt.pg;
+  config.redis = opt.redis;
+  config.root = opt.root;
+  config.mapServerRoot = opt.mapServerRoot;
+
+  // independent npm start / unit test
+  if (!fastify.config) {
+    fastify.decorate('config', config);
+  }
+
+  fastify.register(import('@fastify/sensible'), {
+    errorHandler: false,
+  });
+
+  fastify.register(import('@fastify/url-data'), {
+    errorHandler: false,
+  });
+
+  fastify.register(import('@opengis/fastify-hb'));
+
+  execMigrations().catch(err => console.log(err));
+
+  // plugins / utils / funcs
+  policyPlugin(fastify);
+  redisPlugin(fastify);
+  await pgPlugin(fastify, opt);
+  tablePlugin(fastify, opt);
+  crudPlugin(fastify, opt);
+  utilPlugin(fastify, opt);
+  cronPlugin(fastify, opt);
+  loggerPlugin(fastify, opt);
+
+  // routes / api
+  cronRoutes(fastify, opt);
+  crudRoutes(fastify, opt);
+  loggerRoutes(fastify, opt);
+  propertiesRoutes(fastify, opt);
+  tableRoutes(fastify, opt);
+  utilRoutes(fastify, opt);
+
+  // core templates && cls
+  const filename = fileURLToPath(import.meta.url);
+  const cwd = path.dirname(filename);
+  addTemplateDir(path.join(cwd, 'module/core'));
+}
+export default fp(plugin);

package/package.json

@@ -1,46 +1,46 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "1.1.78",
-  "type": "module",
-  "description": "core-plugins",
-  "main": "index.js",
-  "files": [
-    "server/*",
-    "index.js",
-    "utils.js",
-    "config.js"
-  ],
-  "scripts": {
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "node --test",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
-  },
-  "dependencies": {
-    "@fastify/sensible": "^5.0.0",
-    "@fastify/url-data": "^5.4.0",
-    "@opengis/fastify-hb": "^1.4.8",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
-    "ioredis": "^5.3.2",
-    "nodemailer": "^6.5.0",
-    "pg": "^8.11.3",
-    "pino-abstract-transport": "^2.0.0"
-  },
-  "devDependencies": {
-    "@panzoom/panzoom": "^4.5.1",
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "markdown-it-abbr": "^2.0.0",
-    "mermaid": "^10.9.3",
-    "sass": "1.72.0",
-    "vitepress": "^1.3.4",
-    "vitepress-plugin-mermaid": "^2.0.16",
-    "vitepress-plugin-tabs": "^0.5.0",
-    "vitepress-sidebar": "^1.25.0",
-    "vue": "^3.4.27"
-  },
-  "author": "Softpro",
-  "license": "ISC"
+{
+  "name": "@opengis/fastify-table",
+  "version": "1.1.79",
+  "type": "module",
+  "description": "core-plugins",
+  "main": "index.js",
+  "files": [
+    "server/*",
+    "index.js",
+    "utils.js",
+    "config.js"
+  ],
+  "scripts": {
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "node --test",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs"
+  },
+  "dependencies": {
+    "@fastify/sensible": "^5.0.0",
+    "@fastify/url-data": "^5.4.0",
+    "@opengis/fastify-hb": "^1.4.8",
+    "fastify": "^4.26.1",
+    "fastify-plugin": "^4.0.0",
+    "ioredis": "^5.3.2",
+    "nodemailer": "^6.5.0",
+    "pg": "^8.11.3",
+    "pino-abstract-transport": "^2.0.0"
+  },
+  "devDependencies": {
+    "@panzoom/panzoom": "^4.5.1",
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "markdown-it-abbr": "^2.0.0",
+    "mermaid": "^10.9.3",
+    "sass": "1.72.0",
+    "vitepress": "^1.3.4",
+    "vitepress-plugin-mermaid": "^2.0.16",
+    "vitepress-plugin-tabs": "^0.5.0",
+    "vitepress-sidebar": "^1.25.0",
+    "vue": "^3.4.27"
+  },
+  "author": "Softpro",
+  "license": "ISC"
 }

package/server/migrations/0.sql

@@ -1,80 +1,80 @@
--- fix error if function exists and return type not text i.e bigint
-
-do $$
-
-declare
-m record;
-_pk text;
-_tables json;
-_returnType text;
-
-begin
-
-select format_type(p.prorettype, null) as return_type
-from pg_proc p
-where p.proname = 'next_id'
-and p.pronamespace = 'public'::regnamespace into _returnType;
-
-if (_returnType != 'text') then
-	raise notice 'default reassign start: % -> text', _returnType;
-
-	CREATE EXTENSION if not exists "uuid-ossp";
-
-	SELECT json_object_agg(a.attrelid::regclass, a.attname)
-	FROM   pg_catalog.pg_attribute    a
-	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
-	AND    a.attnum   > 0               -- no system columns
-	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'drop default: %,%', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
-	end loop;
-
-	DROP FUNCTION IF EXISTS next_id();
-
-	CREATE EXTENSION if not exists "uuid-ossp";
-	ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    return replace(public.uuid_generate_v4()::text, '-', '');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'reassign default: %, %', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
-	end loop;
-
-	raise notice 'reassign default finish: %', _tables;
-	
-else 
-	raise notice 'skip default reassign';
-
-		CREATE EXTENSION if not exists "uuid-ossp";
-		ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    return replace(public.uuid_generate_v4()::text, '-', '');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-end if;
-
-end $$
+-- fix error if function exists and return type not text i.e bigint
+
+do $$
+
+declare
+m record;
+_pk text;
+_tables json;
+_returnType text;
+
+begin
+
+select format_type(p.prorettype, null) as return_type
+from pg_proc p
+where p.proname = 'next_id'
+and p.pronamespace = 'public'::regnamespace into _returnType;
+
+if (_returnType != 'text') then
+	raise notice 'default reassign start: % -> text', _returnType;
+
+	CREATE EXTENSION if not exists "uuid-ossp";
+
+	SELECT json_object_agg(a.attrelid::regclass, a.attname)
+	FROM   pg_catalog.pg_attribute    a
+	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
+	AND    a.attnum   > 0               -- no system columns
+	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'drop default: %,%', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
+	end loop;
+
+	DROP FUNCTION IF EXISTS next_id();
+
+	CREATE EXTENSION if not exists "uuid-ossp";
+	ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    return replace(public.uuid_generate_v4()::text, '-', '');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'reassign default: %, %', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
+	end loop;
+
+	raise notice 'reassign default finish: %', _tables;
+	
+else 
+	raise notice 'skip default reassign';
+
+		CREATE EXTENSION if not exists "uuid-ossp";
+		ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    return replace(public.uuid_generate_v4()::text, '-', '');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+end if;
+
+end $$

package/server/migrations/cls.sql

@@ -1,39 +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 'Колір';
+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/context.sql

@@ -0,0 +1,95 @@
+CREATE TABLE IF NOT EXISTS admin.rules();
+ALTER TABLE admin.rules add column if not exists rule_id text;
+ALTER TABLE admin.rules add column if not exists rule_type text;
+ALTER TABLE admin.rules add column if not exists rule_name text;
+ALTER TABLE admin.rules add column if not exists attr text;
+ALTER TABLE admin.rules add column if not exists routes text[];
+ALTER TABLE admin.rules add column if not exists uid text;
+ALTER TABLE admin.rules add column if not exists cdate timestamp without time zone;
+ALTER TABLE admin.rules add column if not exists rule_query text;
+ALTER TABLE admin.rules add column if not exists cls text;
+COMMENT ON COLUMN admin.rules.rule_type IS 'Тип повноваження';
+COMMENT ON COLUMN admin.rules.rule_name IS 'Назва';
+COMMENT ON COLUMN admin.rules.attr IS 'Атрибут';
+COMMENT ON COLUMN admin.rules.routes IS 'Роути';
+COMMENT ON COLUMN admin.rules.uid IS 'Хто створив';
+COMMENT ON COLUMN admin.rules.cdate IS 'Дата створення';
+COMMENT ON COLUMN admin.rules.rule_query IS 'Запит';
+ALTER TABLE admin.rules ALTER COLUMN attr DROP NOT NULL;
+ALTER TABLE admin.rules ALTER COLUMN cdate DROP NOT NULL;ALTER TABLE admin.rules ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
+ALTER TABLE admin.rules ALTER COLUMN cls DROP NOT NULL;
+ALTER TABLE admin.rules ALTER COLUMN routes DROP NOT NULL;
+ALTER TABLE admin.rules ALTER COLUMN rule_id SET NOT NULL;ALTER TABLE admin.rules ALTER COLUMN rule_id SET DEFAULT next_id();
+ALTER TABLE admin.rules ALTER COLUMN rule_name DROP NOT NULL;
+ALTER TABLE admin.rules ALTER COLUMN rule_query DROP NOT NULL;
+ALTER TABLE admin.rules ALTER COLUMN rule_type DROP NOT NULL;
+ALTER TABLE admin.rules ALTER COLUMN uid DROP NOT NULL;
+
+
+CREATE TABLE IF NOT EXISTS admin.accounts();
+ALTER TABLE admin.accounts add column if not exists account_id text;
+ALTER TABLE admin.accounts add column if not exists account_name text;
+ALTER TABLE admin.accounts add column if not exists description text;
+ALTER TABLE admin.accounts add column if not exists uid text;
+ALTER TABLE admin.accounts add column if not exists cdate timestamp without time zone;
+COMMENT ON COLUMN admin.accounts.account_name IS 'Назва';
+COMMENT ON COLUMN admin.accounts.description IS 'Опис';
+COMMENT ON COLUMN admin.accounts.uid IS 'Хто створив';
+COMMENT ON COLUMN admin.accounts.cdate IS 'Дата створення';
+ALTER TABLE admin.accounts ALTER COLUMN account_id SET NOT NULL;ALTER TABLE admin.accounts ALTER COLUMN account_id SET DEFAULT next_id();
+ALTER TABLE admin.accounts ALTER COLUMN account_name DROP NOT NULL;
+ALTER TABLE admin.accounts ALTER COLUMN cdate DROP NOT NULL;ALTER TABLE admin.accounts ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
+ALTER TABLE admin.accounts ALTER COLUMN description DROP NOT NULL;
+ALTER TABLE admin.accounts ALTER COLUMN uid DROP NOT NULL;
+
+
+CREATE TABLE IF NOT EXISTS admin.account_users();
+ALTER TABLE admin.account_users add column if not exists au_id text;
+ALTER TABLE admin.account_users add column if not exists account_id text;
+ALTER TABLE admin.account_users add column if not exists user_uid text;
+ALTER TABLE admin.account_users add column if not exists uid text;
+ALTER TABLE admin.account_users add column if not exists cdate timestamp without time zone;
+COMMENT ON COLUMN admin.account_users.account_id IS 'id Організації';
+COMMENT ON COLUMN admin.account_users.user_uid IS 'id Користувача';
+COMMENT ON COLUMN admin.account_users.uid IS 'Хто створив';
+COMMENT ON COLUMN admin.account_users.cdate IS 'Дата створення';
+ALTER TABLE admin.account_users ALTER COLUMN account_id DROP NOT NULL;
+ALTER TABLE admin.account_users ALTER COLUMN au_id SET NOT NULL;ALTER TABLE admin.account_users ALTER COLUMN au_id SET DEFAULT next_id();
+ALTER TABLE admin.account_users ALTER COLUMN cdate DROP NOT NULL;ALTER TABLE admin.account_users ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
+ALTER TABLE admin.account_users ALTER COLUMN uid DROP NOT NULL;
+ALTER TABLE admin.account_users ALTER COLUMN user_uid DROP NOT NULL;
+
+
+CREATE TABLE IF NOT EXISTS admin.account_grants();
+ALTER TABLE admin.account_grants add column if not exists ag_id text;
+ALTER TABLE admin.account_grants add column if not exists account_id text;
+ALTER TABLE admin.account_grants add column if not exists rule_id text;
+ALTER TABLE admin.account_grants add column if not exists routes text[];
+ALTER TABLE admin.account_grants add column if not exists rule_values text[];
+ALTER TABLE admin.account_grants add column if not exists grants_doc_id text;
+ALTER TABLE admin.account_grants add column if not exists grant_scan text;
+ALTER TABLE admin.account_grants add column if not exists expire_date date;
+ALTER TABLE admin.account_grants add column if not exists actions text[];
+ALTER TABLE admin.account_grants add column if not exists uid text;
+ALTER TABLE admin.account_grants add column if not exists cdate timestamp without time zone;
+COMMENT ON COLUMN admin.account_grants.account_id IS 'id Організації';
+COMMENT ON COLUMN admin.account_grants.rule_id IS 'id Правила';
+COMMENT ON COLUMN admin.account_grants.routes IS 'Роути';
+COMMENT ON COLUMN admin.account_grants.rule_values IS 'Значення';
+COMMENT ON COLUMN admin.account_grants.grants_doc_id IS 'id Документу';
+COMMENT ON COLUMN admin.account_grants.grant_scan IS 'id Скану';
+COMMENT ON COLUMN admin.account_grants.expire_date IS 'Дата закінчення дії дозволу';
+COMMENT ON COLUMN admin.account_grants.actions IS 'Дії';
+COMMENT ON COLUMN admin.account_grants.uid IS 'Хто створив';
+COMMENT ON COLUMN admin.account_grants.cdate IS 'Дата створення';
+ALTER TABLE admin.account_grants ALTER COLUMN account_id DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN actions DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN ag_id SET NOT NULL;ALTER TABLE admin.account_grants ALTER COLUMN ag_id SET DEFAULT next_id();
+ALTER TABLE admin.account_grants ALTER COLUMN cdate DROP NOT NULL;ALTER TABLE admin.account_grants ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
+ALTER TABLE admin.account_grants ALTER COLUMN expire_date DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN grant_scan DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN grants_doc_id DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN routes DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN rule_id DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN rule_values DROP NOT NULL;
+ALTER TABLE admin.account_grants ALTER COLUMN uid DROP NOT NULL;