@opengis/fastify-table 1.1.75 → 1.1.77

package/package.json

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

package/server/migrations/roles.sql

@@ -171,5 +171,5 @@ alter table admin.role_access
 add constraint admin_access_route_id_fkey FOREIGN KEY (route_id) REFERENCES admin.routes(route_id);
 alter table admin.menu add CONSTRAINT admin_menu_name_unique UNIQUE (name);
 ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_role_id_fkey FOREIGN KEY (role_id) REFERENCES admin.roles (role_id);
-ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_uid_fkey FOREIGN KEY (user_uid) REFERENCES admin.users (uid);
+ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_uid_fkey FOREIGN KEY (user_uid) REFERENCES admin.users (uid) on delete cascade;
 ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_uid_role_id_key UNIQUE (user_uid, role_id);

package/server/migrations/users.sql

@@ -119,7 +119,7 @@ ALTER TABLE admin.users_social_auth add column if not exists lang text;
 ALTER TABLE admin.users_social_auth add column if not exists editor_date timestamp without time zone;
 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;
+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;
 
 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/getPG.js

@@ -1,5 +1,8 @@
 import pg from 'pg';
 
+const { types } = pg;
+types.setTypeParser(1082, (stringValue) => stringValue);
+
 import config from '../../../../config.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';

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

@@ -1,5 +1,8 @@
 import pg from 'pg';
 
+const { types } = pg;
+types.setTypeParser(1082, (stringValue) => stringValue);
+
 import config from '../../../../config.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';

package/server/plugins/table/funcs/getSelectMeta.js

@@ -2,6 +2,7 @@ import pgClients from '../../pg/pgClients.js';
 
 import getSelect from './getSelect.js';
 
+const limit = 50;
 const selectMeta = {};
 
 export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
@@ -16,16 +17,14 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   const { sql: original } = cls;
   if (!original.toLowerCase) { console.log(`sql select null: ${name}`); return null; }
 
-  const sql = `with c(id,text) as (${original} ) select * from c`;
-  // large query > slow with() w/o limit
-  const sql1 = `with c(id,text) as (select * from (${original})q limit 0) select * from c`;
+  const sql = `with c(id,text) as (select * from (${original})q limit ${limit}) select * from c`;
 
   /*= == meta table === */
 
   const tableNew = original.toLowerCase().replace(/\n/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
     .map((el) => el.split(/[ )]/)[0].replace(/[\r\n]+/g, ''));
 
-  const dataOrigin = await pg.query(`${sql1} limit 0`);
+  const dataOrigin = await pg.query(sql?.replace(`limit ${limit}`, 'limit 0'));
 
   const dataOrigin1 = await pg.query(`${original} limit 0`);
 

package/server/routes/table/controllers/suggest.js

@@ -33,7 +33,7 @@ export default async function suggest(req) {
 
   const meta = table && column
     ? {
-      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
+      original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} limit ${limit}) select * from c`,
       searchQuery: '("text" ilike $1 )',
     }
     : await getSelectMeta({ name: selectName, nocache: query?.nocache });
@@ -61,7 +61,7 @@ export default async function suggest(req) {
 
   const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
   const where = [search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true';
-  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${where} limit ${limit}`.replace(/{{uid}}/g, user?.uid || '0');
+  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${where} order by text`.replace(/{{uid}}/g, user?.uid || '0');
   if (query.sql && config.local) return sqlSuggest;
 
   // query