@opengis/fastify-table 1.3.48 → 1.3.50

package/index.js

@@ -59,7 +59,7 @@ async function plugin(fastify, opt) {
   });
 
   // core migrations (second argument for core only)
-  await execMigrations(path.join(cwd, 'server/migrations'), true).catch(err => console.log(err));
+  execMigrations(path.join(cwd, 'server/migrations'), true).catch(err => console.log(err));
 
   // core templates && cls
   config.templates?.forEach(el => addTemplateDir(el));

package/package.json

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

package/server/helpers/funcs/select.js

@@ -1,50 +1,49 @@
-import getPG from '../../plugins/pg/funcs/getPG.js';
-import getSelect from '../../plugins/table/funcs/getSelect.js';
-
+import { getPG, getSelect } from "../../../utils.js";
 const pg = getPG();
 
+// todo: remove dupe from npm/admin?
 export default async function select(ids, options) {
-  if (!ids && ids !== false && ids !== 0) {
-    return ids;
-  }
-  if (Array.isArray(ids) && ids.length === 0) {
+  if (!ids || (Array.isArray(ids) && ids.length === 0) || ids === '') {
     return '';
   }
 
   const data = options.hash?.data;
-  if (!data) return '';
-
+  if (!data && data !== false && data !== 0) return '';
   try {
     const idsArray = Array.isArray(ids) ? ids : [ids];
 
     const classifier = await getSelect(data);
 
+
+
     if (!classifier) return `Не знайдено класифікатор ${data}`;
 
+    const arr = classifier.arr || []
     if (classifier.sql && typeof classifier.sql === 'string') {
+
+
+
       const metaQuery = `SELECT * FROM (${classifier.sql})q LIMIT 0`;
       const meta = await pg.query(metaQuery);
       const idColumn = meta.fields[0].name;
       const textColumn = meta.fields[1].name;
 
-      const sql = `SELECT "${idColumn}" AS id, "${textColumn}" AS text FROM (${classifier.sql}) q WHERE "${idColumn}" = ANY($1::text[])`;
+      const q = `SELECT "${idColumn}" AS id, "${textColumn}" AS text FROM (${classifier.sql}) q WHERE "${idColumn}"::text = ANY($1::text[])`;
       const values = [idsArray.map(id => String(id))];
 
-      const { rows } = await pg.query(sql, values);
-      classifier.arr = rows;
-    }
+      const { rows } = await pg.query(q, values);
+      Object.assign(arr, rows);
 
-    if (!Array.isArray(classifier?.arr) || !classifier.arr.length || !classifier.arr.every(item => typeof item === 'object' && item !== null)) {
-      return ids;
     }
+    if (!arr.length) return idsArray;
 
     const results = idsArray.map(id => {
-      const result = classifier.arr.find(el => String(el.id) == String(id));
+      const result = arr.find(el => String(el.id) == String(id));
       return result ? result.text : '';
     });
 
     return results.filter(Boolean).join(', ');
-  } catch (error) {
-    return `Сталася помилка.<!-- err: ${error.toString()} -->`;
+  } catch (err) {
+    return `Сталася помилка.<!-- err: ${err.toString()} -->`;
   }
 }

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

@@ -14,7 +14,7 @@ export default async function filterAPI(req) {
   const { fields: columns = [] } = await pg.query(`select * from ${loadTable.table} t ${sqlTable} limit 0`);
   const { fields = [] } = await pg.query(`select * from ${loadTable.table} t limit 0`);
 
-  const optimizedSQL = `select * from ${loadTable.table} t ${sqlTable}`.replace(/{{uid}}/g, user?.uid);
+  const optimizedSQL = `select * from ${loadTable.table} t ${sqlTable} where ${loadTable.query || '1=1'}`.replace(/{{uid}}/g, user?.uid);
 
   const filters = (loadTable?.filter_list || loadTable?.filters || loadTable?.filterList || []).concat(loadTable?.filterSql || []);