@opengis/fastify-table 2.0.16 → 2.0.17

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

@@ -13,7 +13,8 @@ function getPG(param = {}) {
     const dbListParams = dblist.find((el) => el.key === param?.key) ||
         dblist.find((el) => el.database === (param?.db || param?.database || param) &&
             el.port === param?.port);
-    const { user, password, host, port, db, database, name: origin, } = dbListParams ??
+    const { user, password, host, port, db, database, name: origin, statement_timeout: timeout, // explicit
+     } = dbListParams ??
         (typeof param === "string" ? getDBParams(param) : param || {});
     const name = origin || db || database || param || "client";
     if (pgClients[name])
@@ -24,7 +25,7 @@ function getPG(param = {}) {
         host: host || config.pg?.host,
         port: port || config.pg?.port,
         database: db || database || config.pg?.db || config.pg?.database,
-        statement_timeout: config.pg?.statement_timeout || 10000,
+        statement_timeout: timeout || config.pg?.statement_timeout || 10000,
     };
     if (!dbConfig.database) {
         return null;

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

@@ -12,7 +12,8 @@ async function getPGAsync(param) {
         return null;
     const dbListParams = dblist.find((el) => el.key === param?.key) ||
         dblist.find((el) => el.database === (param?.db || param?.database || param));
-    const { user, password, host, port, db, database, name: origin, } = dbListParams ??
+    const { user, password, host, port, db, database, name: origin, statement_timeout: timeout, // explicit
+     } = dbListParams ??
         (typeof param === "string" ? getDBParams(param) : param || {});
     const name = origin || db || database || param || "client";
     if (pgClients[name]?.tlist)
@@ -23,7 +24,7 @@ async function getPGAsync(param) {
         host: host || config.pg?.host,
         port: port || config.pg?.port,
         database: db || database || config.pg?.db || config.pg?.database,
-        statement_timeout: config.pg?.statement_timeout || 10000,
+        statement_timeout: timeout || config.pg?.statement_timeout || 10000,
     };
     if (!dbConfig.database) {
         return null;

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

@@ -1,3 +1,4 @@
+import pg from "pg";
 import { createHash } from "node:crypto";
 import config from "../../../../config.js";
 import getRedis from "../../redis/funcs/getRedis.js";
@@ -68,34 +69,43 @@ async function init(client) {
     WHERE
       relkind IN ('r', 'v')`);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
-    async function query(q, args = [], isstream = false, timeout = 100000000) {
-        let timeoutWasSet;
+    async function query(q, args = []) {
         try {
-            if (isstream) {
-                await client.query(`set statement_timeout to ${timeout}`);
-                timeoutWasSet = true;
-            }
             const data = await client.query(q, args);
             return data;
         }
         catch (err) {
-            if (err.message === "canceling statement due to statement timeout") {
+            // canceling statement due to statement timeout
+            if (err.code === "57014") {
                 logger.file("timeout/query", { q, stack: err.stack });
+            }
+            throw err;
+        }
+    }
+    async function querySafe(q, param) {
+        const pg1 = new pg.Pool({
+            ...client.options,
+            statement_timeout: param?.timeout || 100000000,
+        });
+        try {
+            const args = Array.isArray(param) ? param : param?.args || [];
+            const data = await pg1.query(q, args);
+            console.log("pg.querySafe ok", q);
+            return data;
+        }
+        catch (err) {
+            if (err.code === "57014") {
+                console.error("pg.querySafe timeout", q);
                 return { rows: [], timeout: true };
             }
-            throw new Error(err);
+            console.error("pg.querySafe error", q);
+            throw err;
         }
         finally {
-            if (timeoutWasSet) {
-                await client.query("RESET statement_timeout");
-            }
+            pg1.end();
+            console.log("pg.querySafe released", q);
         }
     }
-    async function querySafe(q, param) {
-        const args = Array.isArray(param) ? param : param?.args || [];
-        const data = await query(q, args, true, param?.timeout);
-        return data;
-    }
     async function one(q, param) {
         const data = await query(q, Array.isArray(param) ? param : param?.args || []);
         const result = ((Array.isArray(data) ? data.pop() : data)?.rows || [])[0] || {};

package/dist/server/plugins/table/funcs/getFilterSQL/index.js

@@ -77,7 +77,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
     const { fields = [] } = await pg.query(fieldQuery);
     const autoSearchColumn = fields
         ?.filter((el) => pg.pgType?.[el.dataTypeID] === "text")
-        ?.map((el) => el.name)
+        ?.map((el) => `"${el.name}"`)
         .join(",");
     const searchColumn = body?.search_column || body?.meta?.search || autoSearchColumn;
     const fieldsList = (fieldsModel || fields)?.map((el) => el.name);

package/package.json

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