@opengis/fastify-table 1.3.43 → 1.3.45

package/package.json

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

package/server/plugins/crud/funcs/dataDelete.js

@@ -30,7 +30,7 @@ export default async function dataDelete({
     });
   const table1 = table.replace(/"/g, '');
   if (!pg.tlist?.includes(table1)) return 'table not exist';
-  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
+  const delQuery = `delete from ${table} WHERE ${pk}::text = $1::text returning *`;
 
   const extraRes = await extraData({
     table, form: tokenData?.form, id, uid,

package/server/plugins/crud/funcs/dataInsert.js

@@ -4,6 +4,7 @@ import getRedis from '../../redis/funcs/getRedis.js';
 import pgClients from '../../pg/pgClients.js';
 
 import logChanges from './utils/logChanges.js';
+import logger from '../../logger/getLogger.js';
 import extraData from '../../extra/extraData.js';
 
 const rclient = getRedis();
@@ -49,7 +50,11 @@ export default async function dataInsert({
     
     returning *`;
 
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))])
+    .catch(err => {
+      logger.file('crud/insert', { error: err.toString(), stack: err.stack, table, id, referer, uid, q: insertQuery });
+      throw new Error(err.toString());
+    }).then(el => el || {});
 
   const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
 

package/server/plugins/crud/funcs/dataUpdate.js

@@ -46,7 +46,7 @@ export default async function dataUpdate({
   const filterData = Object.keys(data)
     .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && !['editor_date', 'editor_id'].includes(el)));
 
-  const systemColumns = [['editor_date', 'now()', 'updated_at', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`, 'updated_by', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
+  const systemColumns = [['editor_date', 'now()'], ['updated_at', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : null, uid ? ['updated_by', `'${uid.replace(/'/g, "''")}'`] : null].filter((el) => el && names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
 
   const filterValue = filterData.map((el) => {
     const { dataTypeID = 25 } = columns.find((col) => col?.name === el) || {};
@@ -68,7 +68,7 @@ export default async function dataUpdate({
 
   const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? ',' : ''}` : ''}
   ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find(col => col.name === key)?.dataTypeID || '']))?.join(',')} 
-  WHERE ${pk} = $1 returning *`;
+  WHERE ${pk}::text = $1::text returning *`;
   // console.log(updateQuery, filterValue);
   const res = await pg.query(updateQuery, [id, ...filterValue])
     .catch(err => {

package/server/plugins/hook/funcs/applyHook.js

@@ -2,14 +2,14 @@ import config from '../../../../config.js';
 import hookList from '../hookList.js';
 
 export default async function applyHook(name, data) {
-  const { debug } = config;
-  if (debug) console.log('applyHook', name);
+  const { trace } = config;
+  if (trace) console.log('applyHook', name);
   if (!hookList[name]?.length) return null;
   const result = {};
   await Promise.all(hookList[name].map(async (hook) => {
     const hookData = await hook({ ...data, config });
     if (hookData) {
-      if (debug) console.log('applyHook', name, hookData);
+      if (trace) console.log('applyHook', name, hookData);
       Object.assign(result, hookData);
     }
   })).catch((err) => {

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

@@ -189,7 +189,7 @@ export default async function dataAPI(req, reply, called) {
             count(*)::int as total,  
             count(*) FILTER(WHERE ${filterWhere.join(' and ') || 'true'})::int as filtered
             ${aggregates.length ? `,${aggregates.map((el) => `${aggColumns[el.name]}(${el.name}) FILTER(WHERE ${filterWhere.join(' and ') || 'true'}) as ${el.name}`).join(',')}` : ''}
-            from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t ${sqlTable}) t 
+            from (select * ${sql?.filter(el => el.inline).map(el => `,(${el.sql})`).join('') || ''} from ${table} t ${sqlTable})q 
             where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery].filter(el => el).filter((el) => checkQuery(el)).join(' and ') || 'true'} `
     .replace(/{{uid}}/g, uid);
 
@@ -321,6 +321,10 @@ export default async function dataAPI(req, reply, called) {
     filters: filters?.map?.(el => ({ ...el, sql: undefined })),
   };
 
+  if (!res.columns?.length && dbColumns?.length) {
+    Object.assign(res, { columns: dbColumns.map(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] })) });
+  }
+
   // console.log({ add: loadTable.table, form: loadTable.form });
   if (uid && actions.includes('add')) {
     const addTokens = setToken({