@opengis/fastify-table 1.1.129 → 1.1.131

package/package.json

@@ -1,56 +1,56 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "1.1.129",
-  "type": "module",
-  "description": "core-plugins",
-  "keywords": [
-    "fastify",
-    "table",
-    "crud",
-    "pg",
-    "backend"
-  ],
-  "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",
-    "compress": "node compress.js"
-  },
-  "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",
-    "js-yaml": "^4.1.0",
-    "pg": "^8.11.3",
-    "pino": "^9.5.0",
-    "pino-abstract-transport": "^2.0.0",
-    "uglify-js": "^3.19.3"
-  },
-  "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.131",
+  "type": "module",
+  "description": "core-plugins",
+  "keywords": [
+    "fastify",
+    "table",
+    "crud",
+    "pg",
+    "backend"
+  ],
+  "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",
+    "compress": "node compress.js"
+  },
+  "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",
+    "js-yaml": "^4.1.0",
+    "pg": "^8.11.3",
+    "pino": "^9.5.0",
+    "pino-abstract-transport": "^2.0.0",
+    "uglify-js": "^3.19.3"
+  },
+  "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/users.sql

@@ -5,7 +5,7 @@ CREATE TABLE if not exists admin.users();
 ALTER TABLE admin.users add column if not exists uid text NOT NULL DEFAULT next_id();
 ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_uid_pkey cascade;
 ALTER TABLE admin.users DROP CONSTRAINT if exists user_pk cascade;
-ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp cascade;
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp;
 
 ALTER TABLE admin.users add column if not exists login text;
 ALTER TABLE admin.users add column if not exists password text NOT NULL DEFAULT ''::text;
@@ -98,6 +98,7 @@ ALTER TABLE admin.users_social_auth add column if not exists users_social_auth_i
 ALTER TABLE admin.users_social_auth alter column users_social_auth_id set DEFAULT next_id();
 ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_pk cascade;
 ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_users_fk cascade;
+ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_social_id_email_unique;
 
 ALTER TABLE admin.users_social_auth add column if not exists uid text not null;
 ALTER TABLE admin.users_social_auth add column if not exists user_name text;
@@ -121,6 +122,7 @@ ALTER TABLE admin.users_social_auth add column if not exists editor_date timesta
 ALTER TABLE admin.users_social_auth add column if not exists social_auth_url text;
 ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_pk PRIMARY KEY (users_social_auth_id);
 ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_users_fk FOREIGN KEY (uid) REFERENCES admin.users (uid) MATCH SIMPLE on delete cascade;
+ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_social_id_email_unique UNIQUE (social_auth_id,email);
 
 COMMENT ON COLUMN admin.users_social_auth.uid IS 'id пользователя';
 COMMENT ON COLUMN admin.users_social_auth.user_name IS 'Имя пользователя';

package/server/plugins/pg/funcs/getMeta.js

@@ -1,33 +1,33 @@
-import getPG from './getPG.js';
-
-const data = {};
-
-// decorator
-export default async function getMeta(opt) {
-  const pg = opt?.pg || getPG({ name: 'client' });
-  const table = opt?.table || opt;
-
-  if (data[table]) return data[table];
-
-  if (!pg.tlist?.includes(table?.replace?.(/"/g, ''))) {
-    return { error: `${table} - not found`, status: 400 };
-  }
-
-  const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
-  const { pks1 = {} } = await pg.query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 
-  FROM pg_constraint c 
-    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
-  WHERE c.contype='p'::"char" and c.conrelid::regclass = $1::regclass`, [table]).then(el => el.rows?.[0] || {});
-
-  const pk = table.startsWith('public.')
-    ? (pks1[table.replace('public.', '')] || pks1[table.replace('public.', '').replace(/"/g, '')]) 
-    : (pks1[table] || pks1[table.replace(/"/g, '')]);
-
-  const geomAttr = fields.find((el) => pg.pgType?.[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
-
-  const res = {
-    pk, columns: fields, geom: geomAttr, view: pg.relkinds?.[table] === 'v',
-  };
-  data[table] = res;
-  return res;
-}
+import getPG from './getPG.js';
+
+const data = {};
+
+// decorator
+export default async function getMeta(opt) {
+  const pg = opt?.pg || getPG({ name: 'client' });
+  const table = opt?.table || opt;
+
+  if (data[table]) return data[table];
+
+  if (!pg.tlist?.includes(table?.replace?.(/"/g, ''))) {
+    return { error: `${table} - not found`, status: 400 };
+  }
+
+  const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
+  const pks1 = await pg.query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 
+  FROM pg_constraint c 
+    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
+  WHERE c.contype='p'::"char" and c.conrelid::regclass = $1::regclass`, [table]).then(el => el.rows[0].pks1 || {});
+
+  const pk = table.startsWith('public.')
+    ? (pks1[table.replace('public.', '')] || pks1[table.replace('public.', '').replace(/"/g, '')])
+    : (pks1[table] || pks1[table.replace(/"/g, '')]);
+
+  const geomAttr = fields.find((el) => pg.pgType?.[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
+
+  const res = {
+    pk, columns: fields, geom: geomAttr, view: pg.relkinds?.[table] === 'v',
+  };
+  data[table] = res;
+  return res;
+}