fix statement_timeout bug

prostgles · Oct 15, 2023 · 6798a70 · 6798a70
1 parent ef8a4c0
commit 6798a70
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/lib/PubSubManager/initPubSubManager.ts b/lib/PubSubManager/initPubSubManager.ts
@@ -90,21 +90,18 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
               END $$;`
 
             const queryTimeoutMillis = Math.min(5e3, Math.round(this.appCheckFrequencyMS/2));
-            this.db.any(`                     
-              DO $$
+            this.db.any(`    
+              /* 
+                ${REALTIME_TRIGGER_CHECK_QUERY} 
+                ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
+              */
+              DO $$ 
               BEGIN
-                /* 
-                  ${REALTIME_TRIGGER_CHECK_QUERY} 
-                  ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
-                */
-                DO $$ 
-                BEGIN
-                  PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
-                  SELECT pg_cancel_backend(pid)
-                  FROM pg_catalog.pg_stat_activity
-                  WHERE pid <> pg_backend_pid()
-                  AND query = \${checkForStaleTriggers};
-                END $$;
+                PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
+                SELECT pg_cancel_backend(pid)
+                FROM pg_catalog.pg_stat_activity
+                WHERE pid <> pg_backend_pid()
+                AND query = \${checkForStaleTriggers};
               END $$;
             `, { queryTimeoutMillis, checkForStaleTriggers })
             await this.db.any(checkForStaleTriggers);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.1.89",
+  "version": "4.1.90",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/tests/client/PID.txt b/tests/client/PID.txt
@@ -1 +1 @@
-2604230
+2606752
diff --git a/tests/server/package-lock.json b/tests/server/package-lock.json