@opengis/fastify-table 1.2.85 → 1.2.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -31,7 +31,7 @@
     "@fastify/http-proxy": "9.5.0",
     "@fastify/sensible": "^5.0.0",
     "@fastify/url-data": "5.4.0",
-    "@opengis/fastify-hb": "1.4.8",
+    "@opengis/fastify-hb": "1.7.0",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "5.3.2",

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

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

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

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

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -1,4 +1,5 @@
 import getTemplate from '../getTemplate.js';
+import getSelect from '../getSelect.js';
 import pgClients from '../../../pg/pgClients.js';
 import config from '../../../../../config.js';
 
@@ -96,7 +97,8 @@ export default async function getFilterSQL({
         Object.assign(el, { extra: { table: extraDataTable, input: extraColumns.find(item => item?.name === el?.name)?.type } });
       }
       if (!el?.data) return el;
-      const cls = await getTemplate(['cls', 'select'], el.data);
+      // const cls = await getTemplate(['cls', 'select'], el.data); // only git cls
+      const cls = await getSelect(el.data, pg); // git + db cls
 
       if (Array.isArray(cls) && cls?.length) {
         Object.assign(el, { cls: el.data, options: cls, select: `select code, name from admin.cls where parent='${el.data}'` });

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -23,7 +23,7 @@ export default function formatValue({
   const matchNull = { null: 'is null', notnull: 'is not null' }[value];
   // null = true is null, not false
   const matchBoolean = fieldType === 'boolean' ? { true: 'is true', false: 'is false' }[value] : null;
-  const matchMulti = fieldType.includes('[]') ? `::text[] && '{${value}}'::text[]` : null;
+  const matchMulti = fieldType?.includes('[]') ? `::text[] && '{${value}}'::text[]` : null;
   const match = matchNull || matchBoolean || matchMulti || `::text=any('{${value}}'::text[])`;
 
   // geometry

package/server/routes/table/index.js

@@ -16,7 +16,7 @@ async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
   const policy = ['public'];
   fastify.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy }, schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data); // vs.crm.data.api с node
 
   fastify.get(`${prefix}/card/:table/:id`, { config: { policy }, schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { config: { policy }, schema: searchSchema }, search);