@opengis/fastify-table 1.2.64 → 1.2.66

package/package.json

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

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

@@ -20,13 +20,16 @@ async function init(client) {
       from pg_class where relkind in ('r','v')`);
   const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
 
-  // const { queryOriginal = client.query } = client;
-
-  async function query(q, args = []) {
+  async function query(q, args = [], isstream) {
     try {
+      if (isstream) {
+        await client.query('set statement_timeout to 100000000');
+      }
       const data = await client.query(q, args);
+      await client.query('set statement_timeout to 0');
       return data;
     } catch (err) {
+      await client.query('set statement_timeout to 0');
       if (err.message === 'canceling statement due to statement timeout') {
         logger.file('timeout/query', { q, stack: err.stack });
         return { rows: [], timeout: true };
@@ -35,6 +38,12 @@ async function init(client) {
     }
   }
 
+  async function querySafe(q, param = {}) {
+    const { args, isstream } = param;
+    const data = await query(q, args, isstream);
+    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] || {};
@@ -88,7 +97,7 @@ async function init(client) {
   }
 
   Object.assign(client, {
-    one, pgType, pk, tlist, relkinds, queryCache, queryNotice, /* queryOriginal, */
+    one, pgType, pk, tlist, relkinds, queryCache, queryNotice, querySafe,
   });
 }
 

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -205,7 +205,7 @@ function formatValue({
       return { op: 'ilike', query, extra };
     }
 
-    const query = data && sql
+    const query = data && sql && filterType == 'text'
       ? `${name || filter?.id} in ( ( with q(id,name)  as  (${sql}) select id from q where ${filterType === 'autocomplete' ? 'id' : 'name'}::text ${match}) )` // filter with cls
       : `${name}::text ${match}`; // simple filter
     // console.log(query);