@opengis/fastify-table 1.0.1 → 1.0.2

package/package.json

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

package/pg/funcs/getMeta.js

@@ -1,12 +1,11 @@
-//import pgClient from '../pgClients.js';
+// import pgClient from '../pgClients.js';
 import getPG from './getPG.js';
 
 const data = {};
 
 // decorator
 export default async function getMeta(opt) {
-
-  const pg = opt.pg || getPG({ db: 'client' });
+  const pg = opt.pg || getPG({ name: 'client' });
   const table = opt.table || opt;
 
   if (data[table]) return data[table];
@@ -21,13 +20,8 @@ export default async function getMeta(opt) {
   const pk = pks1[table];
 
   const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
-  const q = `select st_extent( ${geomAttr}) as bounds, count(*), 
-    (select st_srid(${geomAttr}) from ${table} where ${geomAttr} is not null limit 1) as srid,  
-    json_agg(distinct ST_GeometryType(${geomAttr}))::json  as geometry from ${table} 
-    where ${geomAttr} is not null `;
-  const geom = await pg.one(q, { cache: 0 });
 
-  const res = { pk, columns: fields, geom };
+  const res = { pk, columns: fields, geom: geomAttr };
   data[table] = res;
   return res;
 }

package/pg/funcs/getPG.js

@@ -4,9 +4,9 @@ import pgClients from '../pgClients.js';
 import init from './init.js';
 
 function getPG({
-  user, password, host, port, db, name: origin
+  user, password, host, port, db, database, name: origin,
 }) {
-  const name = origin || db
+  const name = origin || db || database;
   if (pgClients[name]) return pgClients[name];
 
   const dbConfig = {
@@ -14,7 +14,7 @@ function getPG({
     password: password || config.pg?.password,
     host: host || config.pg?.host,
     port: port || config.pg?.port,
-    database: db || config.pg?.db,
+    database: db || database || config.pg?.db || config.pg?.database,
   };
 
   pgClients[name] = new pg.Pool(dbConfig);

package/table/controllers/data.js

@@ -21,7 +21,8 @@ export default async function data(req) {
   const cols = columns.map((el) => el.name || el).join(',');
   const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
 
-  const fData = query.filter ? await getFilterSQL(query.filter, {
+  const fData = query.filter ? await getFilterSQL({
+    filter: query.filter,
     table,
     json: 1,
   }) : {};