@opengis/fastify-table 1.2.71 → 1.2.73

package/package.json

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

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

@@ -128,7 +128,7 @@ export default async function getFilterSQL({
 
     // table
 
-    const obj = { table: modelQuery, orderby: body?.order || body?.orderby, sqlTable, sqlInline, extraSqlColumns, q };
+    const obj = { body, extraSqlColumns, table, q };
     const optimizedSQL = `select * from ${getOptimizedQuery(obj)} `;
     const tableCount = getOptimizedQuery(obj, true);
 

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -71,7 +71,7 @@ function formatValue({
   if (!name || !value || !fieldType) return {};
 
   // Date filter
-  if (filterType === 'date' /* && dateTypeList.includes(fieldType) */) {
+  if (['date', 'datepicker'].includes(filterType) /* && dateTypeList.includes(fieldType) */) {
     const [min, max] = getDates(value, name);
 
     // check date is valid
@@ -147,8 +147,22 @@ function formatValue({
   const matchMulti = value?.indexOf(',') !== -1 ? `= any('{${value}}'::text[])` : null;
   const match = matchNull || matchBoolean || matchMulti || (operator === '=' ? `='${value}'` : `ilike '%${value}%'`);
 
+  const formatType = {
+    float8: 'numeric',
+    numeric: 'numeric',
+    int4: 'numeric',
+    integer: 'integer',
+    int8: 'numeric',
+    "double precision": 'double precision',
+    varchar: 'text',
+    "character varying": 'character varying',
+    bool: 'boolean',
+    boolean: 'boolean',
+    geometry: 'geom',
+  }[fieldType] || 'text';
+
   /* select query - from admin.cls / filter options */
-  if (['check', 'autocomplete', 'text',  'tags', 'avatar', 'radio'].includes(filterType)) {
+  if (['check', 'autocomplete', 'text', 'tags', 'avatar', 'radio'].includes(filterType)) {
 
     // extra table, example: crm.extra_data
     if (extra?.table && pk) {
@@ -162,7 +176,7 @@ function formatValue({
     // default
     const query = select && filterType === 'text'
       ? `${name}::text in ( ( with q(id,name) as (${select}) select id from q where name::text ${match}) )` // filter with cls
-      : `${name}::text ${match}`; // simple filter
+      : `${name}::${formatType} ${match}`; // simple filter
     return { op: operator, query };
   }
 
@@ -178,15 +192,6 @@ function formatValue({
     return { op: '=', query };
   }
 
-  const formatType = {
-    float8: 'numeric',
-    int4: 'numeric',
-    int8: 'numeric',
-    varchar: 'text',
-    bool: 'boolean',
-    geometry: 'geom',
-  }[fieldType] || 'text';
-
   // sql column?
   if (optimize && optimize.name !== optimize.pk) {
     const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;

package/server/plugins/table/funcs/getFilterSQL/util/getOptimizedQuery.js

@@ -1,6 +1,10 @@
-export default function getOptimizedQuery({ table, orderby, sqlTable, sqlInline, extraSqlColumns, q }, count) {
-  if (sqlInline) {
-    return `(select * ${extraSqlColumns || ''} ${sqlInline ? sqlInline : ''} from ${table} t ${sqlTable && count ? ` ${sqlTable}` : ''})q where 1=1 and ${q ? q.replace('q.', 't.') : '1=1'} ${orderby ? `order by ${orderby}` : ''}`;
-  }
-  return `(select * ${extraSqlColumns || ''} ${sqlInline ? sqlInline : ''} from ${table} t ${sqlTable && count ? ` ${sqlTable}` : ''} where 1=1 and ${q ? q.replace('q.', 't.') : '1=1'} ${orderby ? `order by ${orderby}` : ''})q`;
+export default function getOptimizedQuery({ body, extraSqlColumns, table, q }, count) {
+  const order = body?.orderby || body?.order ? `order by ${body?.orderby || body?.order}` : '';
+
+  const tableName = body?.table || body?.model || table;
+
+  const sqlList = body?.sql?.filter((el) => !el.disabled && el?.sql?.replace && (count ? el.count !== false : true))
+    .map((el) => ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `).join(' ');
+
+  return `(select * ${extraSqlColumns || ''} from ${tableName} t ${sqlList ? ` ${sqlList}` : ''} where 1=1 and ${q?.replace('q.', 't.') || '1=1'} ${order})q`;
 }

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(',');
@@ -138,8 +138,8 @@ export default async function dataAPI(req, reply, called) {
                      ${metaCols} 
                      
                      ${dbColumns.find((el) => el.name === 'geom' && pg.pgType?.[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
-                     from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t   ) t 
-                     ${sqlTable} 
+                     from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t  ${sqlTable} ) t 
+                      
                      ${params.id ? cardSqlTable : ''} 
                      where ${where.join(' and ') || 'true'} 
                      ${order} ${offset}  limit ${limit}`