@opengis/fastify-table 1.1.37 → 1.1.38

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.1.37 - 16.10.2024
+## 1.1.38 - 16.10.2024
 
 - fix migrations
 

package/package.json

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

package/server/migrations/properties.sql

@@ -69,7 +69,7 @@ COMMENT ON TABLE admin.user_properties IS 'Налаштування корист
 
 CREATE TABLE IF NOT EXISTS admin.custom_column();
 ALTER TABLE admin.custom_column DROP CONSTRAINT IF EXISTS admin_custom_column_column_id_pkey cascade;
-alter table admin.custom_column drop constraint if exists admin_custom_column_key_entity_uid_unique;
+alter table admin.custom_column drop constraint if exists admin_custom_column_name_entity_uid_unique;
 
 ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS column_id text;
 ALTER TABLE admin.custom_column ALTER COLUMN column_id SET NOT NULL;

package/table/controllers/table.js

@@ -5,7 +5,7 @@ import { applyHook } from '../../utils.js';
 
 export default async function tableAPI(req) {
   const {
-    pg, params = {}, query = {}, opt = {}, funcs,
+    pg, params = {}, query = {}, opt = {},
   } = req;
   if (!params.id) return { message: 'not enough params', status: 400 };
 
@@ -35,11 +35,11 @@ export default async function tableAPI(req) {
 
   const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
   const cols = loadTable?.table
-    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
+    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') ? `st_asgeojson(${col})::json as "${col}"` : `"${col}"`))?.join(',')
     : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
   const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
-  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
-  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
+  const geom = columnList.includes('geom') ? ',st_asgeojson(geom)::json as geom' : '';
+  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;
 
   if (query.sql === '1') return q;