@opengis/fastify-table 1.0.72 → 1.0.73

package/package.json

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

package/pg/funcs/getPG.js

@@ -3,11 +3,12 @@ import config from '../../config.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
 
-function getPG({
-  user, password, host, port, db, database, name: origin, funcs,
-} = { name: 'client' }) {
+function getPG(param) {
+  const {
+    user, password, host, port, db, database, name: origin, funcs,
+  } = param;
   if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
-  const name = origin || db || database;
+  const name = origin || db || database || param || 'client';
   if (pgClients[name]) return pgClients[name];
 
   const dbConfig = {

package/table/controllers/suggest.js

@@ -17,6 +17,7 @@ export default async function suggest(req) {
   const meta = await getSelectMeta({ name: selectName });
   const pg = meta?.db ? getPG(meta.db) : pg1;
   if (!meta) return { headers, status: 404, message: 'Not found query select ' };
+  if (query.meta) return meta;
 
   const { arr, searchQuery } = meta;
 
@@ -37,7 +38,7 @@ export default async function suggest(req) {
   const pk = meta.originalCols.split(',')[0];
   const val = query.val ? ` ${pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
 
-  const sqlSuggest = `with rows(id,text) as (${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val].filter((el) => el).join(' and ') || 'true'}) select * from rows limit ${limit}`;
+  const sqlSuggest = `with rows(id,text) as (${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'}) select * from rows limit ${limit}`;
   if (query.sql) return sqlSuggest;
 
   // query

package/table/controllers/utils/getSelectMeta.js

@@ -24,7 +24,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
 
   const pg = pg1 || getPG({ db: cls.db || 'client' });
   const { sql: original } = cls;
-  const sql = `with c(id,text) as (${original} ) select * from c where id is not null `;
+  const sql = `with c(id,text) as (${original} ) select * from c  `;
 
   /*= == meta table === */
   const tableNew = original.toLowerCase().replace(/\n/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
@@ -42,7 +42,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
   const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
 
   const searchColumn = cls?.searchColumn || (
-    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
+    dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin.fields[1].name);
 
   const searchQuery = `(${searchColumn.split(',').map((el) => `"${el}" ilike $1 `).join(' or ')})`;
 
@@ -52,7 +52,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
     cols: cols.join(','),
     originalCols: dataOrigin1.fields.map((el) => el.name).join(','),
     db: cls.db,
-    original: original?.includes('where') ? `select * from (${original})q` : original,
+    original: original?.includes('where') ? `select * from (${sql})q` : sql,
     sql,
     count,
     searchQuery,