From e561ce72b0027417e5f4b39ae30f2208d0d38d54 Mon Sep 17 00:00:00 2001
From: prostgles <prostgles@protonmail.com>
Date: Sun, 15 Oct 2023 14:11:13 +0000
Subject: [PATCH] fix statement_timeout bug

---
 lib/PubSubManager/initPubSubManager.ts | 7 +++++--
 package-lock.json                      | 4 ++--
 package.json                           | 2 +-
 tests/client/PID.txt                   | 2 +-
 tests/server/package-lock.json         | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/PubSubManager/initPubSubManager.ts b/lib/PubSubManager/initPubSubManager.ts
index c41a1458..4ed93935 100644
--- a/lib/PubSubManager/initPubSubManager.ts
+++ b/lib/PubSubManager/initPubSubManager.ts
@@ -62,10 +62,12 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
               `
             }
 
+            const queryIdentifier = "prostgles query used to keep track of which prgl backend clients are still connected"
             checkForStaleTriggers = `                          
               DO $$
               BEGIN
                 /* 
+                  ${queryIdentifier}
                   ${REALTIME_TRIGGER_CHECK_QUERY} 
                   ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
                 */
@@ -92,6 +94,7 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
             const queryTimeoutMillis = Math.min(5e3, Math.round(this.appCheckFrequencyMS/2));
             this.db.any(`    
               /* 
+                ${queryIdentifier}
                 ${REALTIME_TRIGGER_CHECK_QUERY} 
                 ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
               */
@@ -101,9 +104,9 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                 SELECT pg_cancel_backend(pid)
                 FROM pg_catalog.pg_stat_activity
                 WHERE pid <> pg_backend_pid()
-                AND query = \${checkForStaleTriggers};
+                AND query = \${queryIdentifier};
               END $$;
-            `, { queryTimeoutMillis, checkForStaleTriggers })
+            `, { queryTimeoutMillis, queryIdentifier })
             await this.db.any(checkForStaleTriggers);
             tries = 5;
             log("updated last_check");
diff --git a/package-lock.json b/package-lock.json
index 5c852388..d14bd1fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "prostgles-server",
-  "version": "4.1.90",
+  "version": "4.1.91",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "prostgles-server",
-      "version": "4.1.90",
+      "version": "4.1.91",
       "license": "MIT",
       "dependencies": {
         "@types/express": "^4.17.13",
diff --git a/package.json b/package.json
index ce7305a2..fa95762b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.1.90",
+  "version": "4.1.91",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/tests/client/PID.txt b/tests/client/PID.txt
index 011908ac..8912f027 100644
--- a/tests/client/PID.txt
+++ b/tests/client/PID.txt
@@ -1 +1 @@
-2606752
+2611629
diff --git a/tests/server/package-lock.json b/tests/server/package-lock.json
index 126cc21e..1fdd0bc3 100644
--- a/tests/server/package-lock.json
+++ b/tests/server/package-lock.json
@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "4.1.90",
+      "version": "4.1.91",
       "license": "MIT",
       "dependencies": {
         "@types/express": "^4.17.13",