@opengis/fastify-table 1.3.44 → 1.3.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.44",
+  "version": "1.3.46",
   "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/plugins/table/funcs/getSelectMeta.js

@@ -8,7 +8,7 @@ import getSelect from './getSelect.js';
 const limit = 50;
 const selectMeta = {};
 
-export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
+export default async function getSelectMeta({ name, pg = pgClients.client, nocache, parent }) {
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
   const cls = await getSelect(name, pg);
@@ -23,7 +23,7 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
   const { sql: original } = cls;
   if (!original.toLowerCase) { console.log(`sql select null: ${name}`); return null; }
 
-  const sql = `with c(id,text) as (select * from (${original})q limit ${limit}) select * from c`;
+  const sql = `with c(id,text) as (select * from (${original.replace('{{parent}}', parent)})q limit ${limit}) select * from c`;
 
   /*= == meta table === */
 
@@ -32,10 +32,10 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
 
   const dataOrigin = await pg1.query(sql?.replace(`limit ${limit}`, 'limit 0'));
 
-  const dataOrigin1 = await pg1.query(`${original} limit 0`);
+  const dataOrigin1 = await pg1.query(`${original.replace('{{parent}}', parent)} limit 0`);
 
   // const table = getTable(original);
-  const count = cls?.count ?? await pg1.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
+  const count = cls?.count ?? await pg1.query(`select count(*) from (${original.replace('{{parent}}', parent)})q`).then((el) => el?.rows?.[0].count);
 
   // column name
   const cols = dataOrigin.fields.map((el) => el.name);

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

@@ -56,7 +56,7 @@ export default async function suggest(req) {
 
   const meta = table && column
     ? getTableColumnMeta(table, column, query?.key || query?.val)
-    : await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache });
+    : await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache, parent });
 
   if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
     return { message: `min length: ${meta.minLength}` };