@opengis/fastify-table 1.2.74 → 1.2.76

package/package.json

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

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

@@ -44,7 +44,7 @@ export default async function getFilterSQL({
   // console.log('extra getFilterSQL', extraDataTable, pg.pk?.[extraDataTable]);
 
   // check sql inline fields count
-  if (!checkInline[body?.table] && body?.sql?.length && body.table) {
+  if (body?.table && !checkInline[body?.table] && body?.sql?.length) {
     const filterSql = body.sql.filter(el => !el?.disabled && (el.inline ?? true));
     const sqlTable = filterSql.map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
     const d = await Promise.all(filterSql.map((el, i) => pg.query(`select  ${el.name || `t${i}`}.* from(select * from ${body.table})t ${sqlTable} limit 0`).then(el => el.fields)))
@@ -63,7 +63,7 @@ export default async function getFilterSQL({
       .map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ${el.name || `t${i}`} on 1=1 `)
       .join('')
     : null;
-  const sqlInline = body.sql?.filter?.(el => el.inline).map(el => `,(${el.sql})`).join('');
+  const sqlInline = body?.sql?.filter?.(el => el.inline).map(el => `,(${el.sql})`).join('');
 
   const fieldQuery = `select * ${extraSqlColumns || ''} ${sqlInline || ''} from ${body?.table || table} t ${sqlTable || ''} limit 0`;
   const { fields = [] } = await pg.query(fieldQuery);

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

@@ -78,7 +78,7 @@ export default async function dataAPI(req, reply, called) {
   const cardSqlFiltered = hookData?.id || params.id ? (cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []) : [];
   const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid)}) ct${i}  on 1=1 `).join('\n') || '' : '';
 
-  const sqlInline = loadTable.sql?.filter?.(el => el.inline).map(el => `,(${el.sql})`).join('') || '';
+  const sqlInline = loadTable?.sql?.filter?.(el => el.inline)?.map(el => `,(${el.sql})`)?.join('') || '';
   const { fields = [] } = pg.queryCache ? await pg.queryCache(`select * ${sqlInline} from ${table} t ${sqlTable}  ${cardSqlTable} limit 0`) : {};
   const dbColumnsTable = fields.map(el => el.name);
   const cols = columns.filter((el) => el.name !== 'geom' && dbColumnsTable.includes(el.name)).map((el) => el.name || el).join(',');
@@ -102,7 +102,7 @@ export default async function dataAPI(req, reply, called) {
   const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
   const fData = checkFilter ? await getFilterSQL({
     pg,
-    table: params.table,
+    table: loadTable ? params.table : table,
     filter: query.filter,
     search: query.search,
     state: query.state,