@opengis/fastify-table 1.1.86 → 1.1.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.86",
+  "version": "1.1.87",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

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

@@ -19,7 +19,7 @@ export default async function dataInsert({
   const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
 
   const filterData = Object.keys(data)
-    .filter((el) => !['cdate', 'editor_date'].includes(el) && data[el] && names.includes(el)).map((el) => [el, data[el]]);
+    .filter((el) => !['cdate', 'editor_date'].includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
 
   const insertQuery = `insert into ${table}
 

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

@@ -7,6 +7,16 @@ import logChanges from './utils/logChanges.js';
 
 const srids = {};
 
+function assignValue(key, i, srid = 4326) {
+  if (key === 'geom') {
+    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)`;
+  }
+  if (key?.includes('geom')) {
+    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srid})`;
+  }
+  return `"${key}"=$${i + 2}`;
+}
+
 export default async function dataUpdate({
   table, id, data, pg: pg1, uid,
 }) {
@@ -22,7 +32,13 @@ export default async function dataUpdate({
 
   const systemColumns = [['editor_date', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
 
-  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
+  const filterValue = filterData.map((el) => {
+    const { dataTypeID = 25 } = columns?.find?.((col) => col?.name === el) || {};
+    if (pg.pgType[dataTypeID]?.endsWith('[]') && ['string', 'number'].includes(typeof data[el])) {
+      Object.assign(data, { [el]: data[el].split(',') });
+    }
+    return [el, data[el]];
+  }).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
 
   // update geometry with srid
   if (!srids[table]) {
@@ -34,11 +50,9 @@ export default async function dataUpdate({
     Object.assign(srids, srids1);
   }
 
-  const updateQuery = `UPDATE ${table} SET ${systemColumns}, ${filterData
-    ?.map((key, i) => (key?.includes('geom') && key !== 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srids[table]?.[key] || 4326})` : undefined)
-      || (key === 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)` : `"${key}"=$${i + 2}`))
-    .join(',')} 
-      WHERE ${pk} = $1 returning *`;
+  const updateQuery = `UPDATE ${table} SET ${systemColumns}, 
+  ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326))?.join(',')} 
+  WHERE ${pk} = $1 returning *`;
   // console.log(updateQuery, filterValue);
   const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};