@opengis/fastify-table 1.3.67 → 1.3.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.67",
+  "version": "1.3.69",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

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

@@ -12,7 +12,7 @@ import getDBParams from './getDBParams.js';
 
 function getPG(param) {
   const dbListParams = dblist.find(el => el.key === param?.key)
-    || dblist.find(el => el.database === (param?.db || param?.database || param));
+    || dblist.find(el => el.database === (param?.db || param?.database || param) && el.port === param?.port);
   const {
     user, password, host, port, db, database, name: origin,
   } = dbListParams ?? (typeof param === 'string' ? getDBParams(param) : param || {});

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

@@ -12,7 +12,7 @@ import getDBParams from './getDBParams.js';
 
 async function getPGAsync(param) {
   const dbListParams = dblist.find(el => el.key === param?.key)
-    || dblist.find(el => el.database === (param?.db || param?.database || param));
+    || dblist.find(el => el.database === (param?.db || param?.database || param) && el.port === param?.port);
   const {
     user, password, host, port, db, database, name: origin,
   } = dbListParams ?? (typeof param === 'string' ? getDBParams(param) : param || {});
@@ -29,8 +29,6 @@ async function getPGAsync(param) {
     statement_timeout: config.pg?.statement_timeout || 10000,
   };
 
-  if (!dbConfig.database) { return null; }
-
   pgClients[name] = new pg.Pool(dbConfig);
 
   await init(pgClients[name]);

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

@@ -1,9 +1,8 @@
 import path from 'node:path';
-import { fileURLToPath } from 'url';
 import { existsSync, readFileSync } from 'node:fs';
 
 import {
-  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal,
+  config, getPG, getTemplate, getSelectMeta, getMeta, applyHook, getSelectVal, logger,
 } from '../../../../utils.js';
 
 const limit = 50;
@@ -13,8 +12,6 @@ const headers = {
   'Cache-Control': 'no-cache',
 };
 
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-
 function getTableColumnMeta(table, column, filtered) {
   const original = {
     true: `with c(id,text) as (select ${column}, ${column} from ${table} group by ${column}) select id, text from c`,
@@ -70,7 +67,9 @@ export default async function suggest(req) {
 
   const meta = table && column
     ? getTableColumnMeta(table, column, query?.key || query?.val)
-    : await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache, parent });
+    : await getSelectMeta({
+      pg: pg1, name: selectName, nocache: query?.nocache, parent,
+    });
 
   if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
     return { message: `min length: ${meta.minLength}` };
@@ -93,10 +92,10 @@ export default async function suggest(req) {
 
     const { columns = [] } = await getMeta({ pg, table: loadTable?.table || tableName });
 
-    const column = columns.find(el => el.name === query.column);
+    const column1 = columns.find(el => el.name === query.column);
     const args = { table: tableName };
-    if (!column) return [];
-    const sqlCls = `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[column.dataTypeID]?.includes('[]') ? `unnest(${column.name})` : `${column.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
+    if (!column1) return [];
+    const sqlCls = `select array_agg(distinct value)::text[] from (select ${pg.pgType?.[column1.dataTypeID]?.includes('[]') ? `unnest(${column1.name})` : `${column1.name}`} as value from ${(loadTable?.table || tableName).replace(/'/g, "''")} where ${hookBody?.query || loadTable?.query || '1=1'})q`;
 
     if (query.sql && (config.local || user?.user_type?.includes?.('admin'))) {
       return sqlCls;
@@ -113,6 +112,20 @@ export default async function suggest(req) {
 
       const data2 = data1.filter((el) => el.id && vals.includes(el.id.toString()));
       const data = data2.slice(0, Math.min(query.limit || limit, limit));
+
+      if (config.debug) {
+        logger.file('suggest/debug', {
+          type: 1,
+          loadTable: loadTable?.table,
+          tableName,
+          column: column?.name,
+          data,
+          data1,
+          data2,
+          query,
+        });
+      }
+
       return {
         time: Date.now() - time,
         limit: Math.min(query.limit || limit, limit),
@@ -122,7 +135,7 @@ export default async function suggest(req) {
         sql: (config.local || user?.user_type?.includes?.('admin')) ? sqlCls : undefined,
         data,
       };
-    };
+    }
   }
 
   if (arr) {
@@ -131,6 +144,16 @@ export default async function suggest(req) {
       ? arr?.filter((el) => !lower || (el[lang] || el.text)?.toLowerCase()?.indexOf(lower) !== -1)?.filter((el) => !query.val || el.id === query.val)
       : arr;
     const data = data1.slice(0, Math.min(query.limit || limit, limit));
+
+    if (config.debug) {
+      logger.file('suggest/debug', {
+        type: 2,
+        key: query.key,
+        data,
+        data1,
+      });
+    }
+
     return {
       time: Date.now() - time,
       limit: Math.min(query.limit || limit, limit),
@@ -171,8 +194,8 @@ export default async function suggest(req) {
   // query
   const { rows: dataNew } = await pg.query(sqlSuggest, query.key ? [`${query.key.toLowerCase()}`] : []);
   // const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`${query.key}`] : []) : {};
-  const ids = dataNew.map((el) => el.id);
-  const data = dataNew.concat((/* dataNew1 || */[]).filter(el => !ids?.includes(el.id))).filter(el => el.text);
+  // const ids = dataNew.map((el) => el.id);
+  const data = dataNew.filter(el => el.id && el.text);
 
   if (query.sel) {
     const clsData = await getSelectVal({
@@ -183,6 +206,17 @@ export default async function suggest(req) {
     data.forEach(el => Object.assign(el, { text: clsData?.[el.id || ''] || el.id }));
   }
 
+  if (config.debug) {
+    logger.file('suggest/debug', {
+      type: 3,
+      sel: query.sel,
+      data,
+      dataNew,
+      sqlSuggest,
+      // ids,
+    });
+  }
+
   const message = {
     time: Date.now() - time,
     limit: Math.min(query.limit || meta.limit || limit, limit),