@opengis/fastify-table 1.2.77 → 1.2.79

package/package.json

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

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

@@ -134,9 +134,9 @@ export default async function suggest(req) {
 
   const { columns = [] } = await getMeta({ pg: pg1, table: tableName1 });
 
-  const filterColumn = query.column ? columns.find(el => el.name === query.column)?.name : null;
-  const filter = query.token && pg.pk?.[loadTable?.table || query.token] && filterColumn
-    ? `id in (select ${filterColumn} from ${(loadTable?.table || query.token).replace(/'/g, "''")})`
+  const { name: filterColumn, dataTypeID } = query.column ? (columns.find(el => el.name === query.column) || {}) : {};
+  const filter = query.token && pg.pk?.[loadTable?.table || query.token] && filterColumn && dataTypeID
+    ? `id in (select ${pg.pgType[dataTypeID]?.includes('[]') ? `unnest(${filterColumn})` : filterColumn} from ${(loadTable?.table || query.token).replace(/'/g, "''")})`
     : 'true';
 
   const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} order by 2) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || '0');
@@ -149,7 +149,7 @@ export default async function suggest(req) {
   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)));
+  const data = dataNew.concat((/* dataNew1 || */[]).filter(el => !ids?.includes(el.id))).filter(el => el.text);
 
   if (query.sel) {
     const clsData = await getSelectVal({