@opengis/fastify-table 1.1.104 → 1.1.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.104",
+  "version": "1.1.106",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
@@ -24,8 +24,10 @@
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "^5.3.2",
+    "js-yaml": "^4.1.0",
     "nodemailer": "^6.5.0",
     "pg": "^8.11.3",
+    "pino": "^9.5.0",
     "pino-abstract-transport": "^2.0.0"
   },
   "devDependencies": {
@@ -43,4 +45,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

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

@@ -1,3 +1,4 @@
+import { getPG } from '@opengis/fastify-table/utils.js';
 import logger from '../../logger/getLogger.js';
 import autoIndex from '../../pg/funcs/autoIndex.js';
 import pgClients from '../../pg/pgClients.js';
@@ -11,6 +12,8 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
   const cls = await getSelect(name, pg);
+  const pg1 = cls?.db ? getPG(cls.db) : pg;
+  if (!pg1?.pk) await pg1.init();
 
   if (!cls) return null;
   if (cls.arr) return cls;
@@ -26,17 +29,17 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   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(sql?.replace(`limit ${limit}`, 'limit 0'));
+  const dataOrigin = await pg1.query(sql?.replace(`limit ${limit}`, 'limit 0'));
 
-  const dataOrigin1 = await pg.query(`${original} limit 0`);
+  const dataOrigin1 = await pg1.query(`${original} limit 0`);
 
   // const table = getTable(original);
-  const count = cls?.count ?? await pg.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
+  const count = cls?.count ?? await pg1.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
 
   // column name
   const cols = dataOrigin.fields.map((el) => el.name);
   const originalCols = dataOrigin1.fields.map((el) => el.name);
-  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
+  const type = dataOrigin.fields.map((el) => pg1.pgType?.[el.dataTypeID] || 'text');
 
   autoIndex({ table: tableNew[0], columns: [originalCols[1]].concat(cls?.searchColumn?.split(',')), gin: 1 }).catch(err => logger.error(err));