@opengis/fastify-table 2.4.18 → 2.4.19

package/dist/server/plugins/pg/funcs/getMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAMA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAyE5D"}
+{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAMA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAmG5D"}

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -3,7 +3,7 @@ import getPG from "./getPG.js";
 import { BadRequestError } from "../../../../errors.js";
 const data = {};
 export default async function getMeta(opt, nocache) {
-    const pg = opt?.pg || getPG({ name: "client" });
+    const pg = opt?.pg || getPG();
     if (!pg) {
         throw BadRequestError("pg client not found");
     }
@@ -11,24 +11,42 @@ export default async function getMeta(opt, nocache) {
     if (!pg.pk || nocache) {
         await init(pg);
     }
-    const table1 = opt?.table || opt;
-    const table = pg.pk?.[table1] ? table1 : table1?.replace?.(/"/g, "");
-    if (pg?.options?.database && data[pg.options.database]?.[table] && !nocache)
-        return data[pg.options.database][table];
-    if (!pg?.tlist?.includes(table) &&
-        !pg?.tlist?.includes(table?.replace?.(/"/g, ""))) {
-        throw BadRequestError(`table not found: ${table}`);
+    const tableOriginal = opt?.table || opt;
+    const [schemaName, tableName] = tableOriginal?.replace?.(/"/g, "").split(".");
+    const tableSafe = `${schemaName}."${tableName}"`;
+    const tableUnsafe = `${schemaName}.${tableName}`;
+    if (pg?.options?.database &&
+        data[pg.options.database]?.[tableUnsafe] &&
+        !nocache) {
+        return data[pg.options.database][tableUnsafe];
     }
-    const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
+    const tableRows = await pg
+        .query(`SELECT
+        nspname || '.' || relname as name,
+        relkind
+      FROM pg_class a
+      JOIN pg_namespace b
+        ON b.oid = a.relnamespace
+      WHERE relkind IN ('r', 'v', 'm')`)
+        .then((r) => r.rows || []);
+    const tlist = tableRows.map((el) => el.name);
+    if (!tlist.includes(tableUnsafe)) {
+        throw BadRequestError(`table not found: ${tableOriginal}`);
+    }
+    const relkinds = tableRows.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.relkind }), {});
+    const fields = await pg
+        .query(`select * from ${tableSafe} limit 0`)
+        .then((r) => r.fields || []);
+    // remove quotes from table names
     const pks1 = await pg
-        .query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks1 
+        .query(`SELECT json_object_agg(replace(c.conrelid::regclass::text,'"',''), a.attname) 
   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" and c.conrelid::regclass = $1::regclass`, [table])
-        .then((el) => el.rows[0].pks1 || {});
-    const pk = table.startsWith("public.")
-        ? pks1[table.replace("public.", "")]
-        : pks1[table] || pg.pk[table];
+  WHERE c.contype='p'::"char"`)
+        .then((r) => r.rows[0].json_object_agg || {});
+    const pk = tableUnsafe.startsWith("public.")
+        ? pks1[tableUnsafe.replace("public.", "")]
+        : pks1[tableUnsafe];
     const geomColumns = fields.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry");
     const geomAttr = geomColumns.find((el) => el.name === "geom_4326") || geomColumns[0];
     const dbColumns = await pg
@@ -36,21 +54,20 @@ export default async function getMeta(opt, nocache) {
     attname, 
     json_build_object(
       'title', pg_catalog.col_description(attrelid,attnum)
-      /*,'type', atttypid::regtype */
     )
   ) from pg_catalog.pg_attribute a 
-  where attrelid=$1::regclass and attnum>0`, [table])
+  where attrelid=$1::regclass and attnum>0`, [tableSafe])
         .then((el) => el.rows?.[0]?.json_object_agg || {});
     fields.forEach((el) => Object.assign(el, { ...(dbColumns[el.name] || {}) }));
     const res = {
         pk,
         columns: fields,
         geom: geomAttr?.name,
-        view: ["v", "m"].includes(pg.relkinds?.[table]),
+        view: ["v", "m"].includes(relkinds?.[tableSafe]),
     };
     if (!data[pg.options.database]) {
         data[pg.options.database] = {};
     }
-    data[pg.options.database][table] = res;
+    data[pg.options.database][tableUnsafe] = res;
     return res;
 }

package/dist/server/plugins/pg/funcs/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,iBAAe,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,iBA6NtC;AAGD,eAAe,IAAI,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,iBAAe,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,iBA8NtC;AAGD,eAAe,IAAI,CAAC"}

package/dist/server/plugins/pg/funcs/init.js

@@ -78,6 +78,8 @@ async function init(client) {
             throw new Error("empty pg client");
         try {
             const data = await client.query(q, args);
+            if (config.trace)
+                console.log(q, args);
             return data;
         }
         catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.4.18",
+  "version": "2.4.19",
   "type": "module",
   "description": "core-plugins",
   "keywords": [