prostgles-server 4.2.75 → 4.2.77

package/dist/PubSubManager/getInitQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInitQuery.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/getInitQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAsC,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIpF,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,eAAO,MAAM,YAAY,SAAwB,aAAa,KAAG,QAAQ,MAAM,CA4kB9E,CAAA"}
+{"version":3,"file":"getInitQuery.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/getInitQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAsC,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIpF,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,eAAO,MAAM,YAAY,SAAwB,aAAa,KAAG,QAAQ,MAAM,CA0kB9E,CAAA"}

package/dist/PubSubManager/getInitQuery.js

@@ -327,7 +327,6 @@ BEGIN
                
             END;
 
-        --COMMIT;
         $$ LANGUAGE plpgsql;
         COMMENT ON FUNCTION ${exports.DB_OBJ_NAMES.data_watch_func} IS 'Prostgles internal function used to notify when data in the table changed';
 
@@ -382,8 +381,7 @@ BEGIN
                         FOREACH op IN ARRAY operations
                         LOOP 
                             trg_name := concat_ws('_', 'prostgles_triggers', trw.table_name, op);
-                            
-                            --EXECUTE format(' DROP TRIGGER IF EXISTS %I ON %s ;' , trg_name, trw.table_name);
+                             
                             EXECUTE format(' ALTER TABLE %s DISABLE TRIGGER %I ;', trw.table_name, trg_name);
                         END LOOP;
                                       

package/dist/PubSubManager/getInitQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"getInitQuery.js","sourceRoot":"","sources":["../../lib/PubSubManager/getInitQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getInitQuery.js","sourceRoot":"","sources":["../../lib/PubSubManager/getInitQuery.ts"],"names":[],"mappings":"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"}

package/dist/PubSubManager/initPubSubManager.js

@@ -36,7 +36,7 @@ async function initPubSubManager() {
         WHERE app_id = ${(0, PubSubManager_1.asValue)(this.appId)}
       `);
             console.log("REMOVE app check disabled");
-            if (!this.appCheck && Math.random() < 12) {
+            if (!this.appCheck && Math.random() > 12) {
                 this.appCheck = setInterval(async () => {
                     let checkForStaleTriggers = "";
                     try {

package/dist/PubSubManager/orphanTriggerCheck.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orphanTriggerCheck.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":"AAsBA,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,cAqD5B,CAAC"}
+{"version":3,"file":"orphanTriggerCheck.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":"AAoBA,+EAA+E;AAC/E,eAAO,MAAM,gBAAgB,cA6C5B,CAAC"}

package/dist/PubSubManager/orphanTriggerCheck.js

@@ -18,7 +18,6 @@ const connectedApplicationNamesQuery = `
     WHERE pid = pg_backend_pid()
   )
 `;
-const LAST_CHECKED_SETTING_NAME = 'prostgles.last_checked';
 /** It is a function to prevent undefined EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID */
 const getAppCheckQuery = () => `
   /* 
@@ -34,11 +33,6 @@ const getAppCheckQuery = () => `
       WHERE  table_schema = 'prostgles'
       AND    table_name   = 'apps'
     )
-    /* Ensure we don't check too often */
-    AND (
-      NULLIF(current_setting('${LAST_CHECKED_SETTING_NAME}', true), '') IS NULL
-      OR current_setting('${LAST_CHECKED_SETTING_NAME}', true)::timestamp < NOW() - INTERVAL '1 minute'
-    )
     /* Ensure we don't check in paralel */
     AND NOT EXISTS (
       SELECT 1
@@ -46,10 +40,7 @@ const getAppCheckQuery = () => `
       WHERE s.query ilike '%${queryIdentifier}%'
       AND s.state = 'active'
     )
-  THEN
-    EXECUTE format('SET LOCAL ${LAST_CHECKED_SETTING_NAME} TO %L', now());
-    --USED FOR DEBUG REMOVE
-    PERFORM pg_notify('prostgles', current_setting('${LAST_CHECKED_SETTING_NAME}', true));
+  THEN 
 
     IF EXISTS (
       ${connectedApplicationNamesQuery}

package/dist/PubSubManager/orphanTriggerCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"orphanTriggerCheck.js","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,2DAAmE;AAEnE;;;;GAIG;AAEH,MAAM,eAAe,GAAG,sFAAsF,CAAC;AAC/G,MAAM,8BAA8B,GAAG;;;;;;;;CAQtC,CAAC;AAEF,MAAM,yBAAyB,GAAG,wBAAwB,CAAC;AAE3D,+EAA+E;AACxE,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;;MAEhC,eAAe;MACf,gDAA4B;MAC5B,6BAAa,CAAC,kCAAkC;;;;;;;;;;;;gCAYtB,yBAAyB;4BAC7B,yBAAyB;;;;;;8BAMvB,eAAe;;;;gCAIb,yBAAyB;;sDAEH,yBAAyB;;;QAGvE,8BAA8B;;;;;;;;;;;;;;;;;;;;;CAqBrC,CAAC;AArDW,QAAA,gBAAgB,oBAqD3B"}
+{"version":3,"file":"orphanTriggerCheck.js","sourceRoot":"","sources":["../../lib/PubSubManager/orphanTriggerCheck.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,2DAAmE;AAEnE;;;;GAIG;AAEH,MAAM,eAAe,GAAG,sFAAsF,CAAC;AAC/G,MAAM,8BAA8B,GAAG;;;;;;;;CAQtC,CAAC;AAEF,+EAA+E;AACxE,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;;MAEhC,eAAe;MACf,gDAA4B;MAC5B,6BAAa,CAAC,kCAAkC;;;;;;;;;;;;;;8BAcxB,eAAe;;;;;;QAMrC,8BAA8B;;;;;;;;;;;;;;;;;;;;;CAqBrC,CAAC;AA7CW,QAAA,gBAAgB,oBA6C3B"}

package/lib/PubSubManager/getInitQuery.ts

@@ -329,7 +329,6 @@ BEGIN
                
             END;
 
-        --COMMIT;
         $$ LANGUAGE plpgsql;
         COMMENT ON FUNCTION ${DB_OBJ_NAMES.data_watch_func} IS 'Prostgles internal function used to notify when data in the table changed';
 
@@ -384,8 +383,7 @@ BEGIN
                         FOREACH op IN ARRAY operations
                         LOOP 
                             trg_name := concat_ws('_', 'prostgles_triggers', trw.table_name, op);
-                            
-                            --EXECUTE format(' DROP TRIGGER IF EXISTS %I ON %s ;' , trg_name, trw.table_name);
+                             
                             EXECUTE format(' ALTER TABLE %s DISABLE TRIGGER %I ;', trw.table_name, trg_name);
                         END LOOP;
                                       

package/lib/PubSubManager/initPubSubManager.ts

@@ -41,7 +41,7 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
       `);
       
       console.log("REMOVE app check disabled");
-      if (!this.appCheck && Math.random() < 12) {
+      if (!this.appCheck && Math.random() > 12) {
 
         this.appCheck = setInterval(async () => {
           let checkForStaleTriggers = "";

package/lib/PubSubManager/orphanTriggerCheck.ts

@@ -16,9 +16,7 @@ const connectedApplicationNamesQuery = `
     FROM pg_catalog.pg_stat_activity
     WHERE pid = pg_backend_pid()
   )
-`;
-
-const LAST_CHECKED_SETTING_NAME = 'prostgles.last_checked';
+`; 
 
 /** It is a function to prevent undefined EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID */
 export const getAppCheckQuery = () => `
@@ -35,11 +33,6 @@ export const getAppCheckQuery = () => `
       WHERE  table_schema = 'prostgles'
       AND    table_name   = 'apps'
     )
-    /* Ensure we don't check too often */
-    AND (
-      NULLIF(current_setting('${LAST_CHECKED_SETTING_NAME}', true), '') IS NULL
-      OR current_setting('${LAST_CHECKED_SETTING_NAME}', true)::timestamp < NOW() - INTERVAL '1 minute'
-    )
     /* Ensure we don't check in paralel */
     AND NOT EXISTS (
       SELECT 1
@@ -47,10 +40,7 @@ export const getAppCheckQuery = () => `
       WHERE s.query ilike '%${queryIdentifier}%'
       AND s.state = 'active'
     )
-  THEN
-    EXECUTE format('SET LOCAL ${LAST_CHECKED_SETTING_NAME} TO %L', now());
-    --USED FOR DEBUG REMOVE
-    PERFORM pg_notify('prostgles', current_setting('${LAST_CHECKED_SETTING_NAME}', true));
+  THEN 
 
     IF EXISTS (
       ${connectedApplicationNamesQuery}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.75",
+  "version": "4.2.77",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/isomorphicQueries.spec.ts

@@ -486,10 +486,12 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
           { returnType: "rows" }
         ) as { tgname: string; enabled: boolean; }[];
       }
-      await sub.unsubscribe();
       let validTriggers = await getTableTriggers(table_name);
+      console.log("unsubscribe start")
+      await sub.unsubscribe();
+      console.log("unsubscribe end")
       assert.equal(validTriggers.filter(t => t.enabled).length, 3, '3 Triggers should be enabled');
-      await db.sql?.(`DELETE FROM prostgles.app_triggers`, []); //  WHERE table_name = $1
+      await db.sql?.(`DELETE FROM prostgles.app_triggers`, []);
       validTriggers = await getTableTriggers(table_name);
       assert.equal(validTriggers.length, 3, '3 Triggers should exist but be disabled');
       assert.equal(validTriggers.filter(t => t.enabled).length, 0);

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "4.2.74",
+      "version": "4.2.76",
       "license": "MIT",
       "dependencies": {
         "bluebird": "^3.7.2",