@opengis/fastify-table 1.0.93 → 1.0.95

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.95 - 12.09.2024
+
+- add dbname to getFolder func
+
+## 1.0.94 - 11.09.2024
+
+- fix getMeta (public schema)
+
 ## 1.0.93 - 05.09.2024
 
 - fix data API with sql columns filter

package/index.js

@@ -43,7 +43,7 @@ async function plugin(fastify, opt) {
   fastify.decorate('getFolder', (req, type = 'server') => {
     if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
     const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
-    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
+    const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
     return filepath;
   });
 

package/package.json

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

package/pg/funcs/getMeta.js

@@ -1,27 +1,27 @@
-// import pgClient from '../pgClients.js';
-import getPG from './getPG.js';
-
-const data = {};
-
-// decorator
-export default async function getMeta(opt) {
-  const pg = opt.pg || getPG({ name: 'client' });
-  const table = opt.table || opt;
-
-  if (data[table]) return data[table];
-
-  if (!pg.tlist?.includes(table)) {
-    return { error: `${table} - not found`, status: 400 };
-  }
-
-  const { fields } = await pg.query(`select * from ${table} where $1=$1 limit 0`, [1]);
-  const { pks1 } = await pg.one(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 FROM pg_constraint c 
-    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] WHERE c.contype='p'::"char"`, { cache: 0 });
-  const pk = pks1[table];
-
-  const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
-
-  const res = { pk, columns: fields, geom: geomAttr };
-  data[table] = res;
-  return res;
-}
+// import pgClient from '../pgClients.js';
+import getPG from './getPG.js';
+
+const data = {};
+
+// decorator
+export default async function getMeta(opt) {
+  const pg = opt.pg || getPG({ name: 'client' });
+  const table = opt.table || opt;
+
+  if (data[table]) return data[table];
+
+  if (!pg.tlist?.includes(table)) {
+    return { error: `${table} - not found`, status: 400 };
+  }
+
+  const { fields } = await pg.query(`select * from ${table} where $1=$1 limit 0`, [1]);
+  const { pks1 } = await pg.one(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 FROM pg_constraint c 
+    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] WHERE c.contype='p'::"char"`, { cache: 0 });
+  const pk = table.startsWith('public.') ? pks1[table.replace('public.', '')] : pks1[table];
+
+  const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
+
+  const res = { pk, columns: fields, geom: geomAttr };
+  data[table] = res;
+  return res;
+}