@opengis/fastify-table 1.1.144 → 1.1.146

package/package.json

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

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

@@ -10,12 +10,12 @@ const sqls = {
 };
 
 export default async function getSelect(name, pg = pgClients.client) {
-  if (loadCls[name]) return loadCls[name];
+  if (loadCls[name] && false) return loadCls[name];
 
   const clsDataGIT = await getTemplate(['cls', 'select'], name);
   const { type } = !clsDataGIT && pg.pk?.['admin.user_cls'] ? await pg.query('select type from admin.user_cls where parent is null and name=$1 union all select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};
   const q = !clsDataGIT && type && ['sql', 'json'].includes(type) ? sqls[type] : undefined;
-  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.[0]?.data) : undefined;
+  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.find(el => el?.data)?.data) : undefined;
   const clsData = clsDataGIT || clsDataDB;
   if (!clsData) return null;
 

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

@@ -28,7 +28,9 @@ export default async function suggest(req) {
   if (table && !pg1.pk[body?.table || table]) {
     return { status: 400, message: 'param name is invalid: 1' };
   }
-  const columnExists = body?.columns?.find((col) => col?.name === column);
+
+  const tableMeta = await getMeta({ table: body?.table || table });
+  const columnExists = (body?.columns || tableMeta?.columns)?.find((col) => col?.name === column);
 
   if (table && (!column || !columnExists)) {
     return { status: 400, message: 'param name is invalid: 2' };
@@ -121,7 +123,7 @@ export default async function suggest(req) {
   // return meta;
 
   const val = query.val ? ` ${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
-  const where = [search, val, `${meta.pk} is not null`].filter((el) => el).join(' and ') || 'true';
+  const where = [search, val, meta.pk ? `${meta.pk} is not null` : null].filter((el) => el).join(' and ') || 'true';
 
   const loadTable = await getTemplate('table', query.token);
   const { columns = [] } = await getMeta({ table: loadTable?.table || query.token });