prostgles-server 4.0.44 → 4.0.46

package/lib/PubSubManager/PubSubManager.js

@@ -143,6 +143,7 @@ class PubSubManager {
         return true;
     };
     appChecking = false;
+    checkedListenerTableCond;
     init = initPubSubManager_1.initPubSubManager.bind(this);
     static SCHEMA_ALTERING_QUERIES = ['CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO'];
     static EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID = "prostgles internal query that should be excluded from schema watch ";
@@ -155,106 +156,107 @@ class PubSubManager {
         }
         try {
             await this.db.any(`
-                BEGIN;--  ISOLATION LEVEL SERIALIZABLE;
-                
-                /**                                 ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
-                 *  Drop stale triggers
-                 * */
-                DO
-                $do$
-                  DECLARE trg RECORD;
-                    q   TEXT;
-                    ev_trg_needed BOOLEAN := FALSE;
-                    ev_trg_exists BOOLEAN := FALSE;
-                    is_super_user BOOLEAN := FALSE;
-                BEGIN
-                    --SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-                    
-                    LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
-                    EXECUTE format(
-                      $q$
+        BEGIN;--  ISOLATION LEVEL SERIALIZABLE;
+        
+        /**                                 
+         * ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
+         *  Drop stale triggers
+         * */
+        DO
+        $do$
+          DECLARE trg RECORD;
+            q   TEXT;
+            ev_trg_needed BOOLEAN := FALSE;
+            ev_trg_exists BOOLEAN := FALSE;
+            is_super_user BOOLEAN := FALSE;
+        BEGIN
+            --SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+            
+            LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
+            EXECUTE format(
+              $q$
 
-                        CREATE TEMP TABLE %1$I AS --ON COMMIT DROP AS
-                        SELECT * FROM prostgles.app_triggers;
+                CREATE TEMP TABLE %1$I AS --ON COMMIT DROP AS
+                SELECT * FROM prostgles.app_triggers;
 
-                        DELETE FROM prostgles.app_triggers;
+                DELETE FROM prostgles.app_triggers;
 
-                        INSERT INTO prostgles.app_triggers
-                        SELECT * FROM %1$I;
+                INSERT INTO prostgles.app_triggers
+                SELECT * FROM %1$I;
 
-                        DROP TABLE IF EXISTS %1$I;
-                      $q$, 
-                      ${(0, exports.asValue)('triggers_' + this.appID)}
-                    );
-  
-                    is_super_user := EXISTS (select 1 from pg_user where usename = CURRENT_USER AND usesuper IS TRUE);
+                DROP TABLE IF EXISTS %1$I;
+              $q$, 
+              ${(0, exports.asValue)('triggers_' + this.appID)}
+            );
 
-                    /**
-                     *  Delete stale app records
-                     * */
-                    DELETE FROM prostgles.apps
-                    WHERE last_check < NOW() - 8 * check_frequency_ms * interval '1 millisecond';
+            is_super_user := EXISTS (select 1 from pg_user where usename = CURRENT_USER AND usesuper IS TRUE);
 
-                    DELETE FROM prostgles.app_triggers
-                    WHERE app_id NOT IN (SELECT id FROM prostgles.apps);
-                    
-                    /* DROP the old buggy schema watch trigger */
-                    IF EXISTS (
-                      SELECT 1 FROM pg_catalog.pg_event_trigger
-                      WHERE evtname = 'prostgles_schema_watch_trigger'
-                    ) AND is_super_user IS TRUE 
-                    THEN
-                        DROP EVENT TRIGGER IF EXISTS prostgles_schema_watch_trigger;
-                    END IF;
+            /**
+             *  Delete stale app records, this will delete related triggers
+             * */
+            DELETE FROM prostgles.apps
+            WHERE last_check < NOW() - 8 * check_frequency_ms * interval '1 millisecond';
 
-                    ev_trg_needed := EXISTS (SELECT 1 FROM prostgles.apps WHERE watching_schema IS TRUE);
-                    ev_trg_exists := EXISTS (
-                        SELECT 1 FROM pg_catalog.pg_event_trigger
-                        WHERE evtname = ${(0, exports.asValue)(getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger)}
-                    );
+            DELETE FROM prostgles.app_triggers
+            WHERE app_id NOT IN (SELECT id FROM prostgles.apps);
+            
+            /* DROP the old buggy schema watch trigger */
+            IF EXISTS (
+              SELECT 1 FROM pg_catalog.pg_event_trigger
+              WHERE evtname = 'prostgles_schema_watch_trigger'
+            ) AND is_super_user IS TRUE 
+            THEN
+                DROP EVENT TRIGGER IF EXISTS prostgles_schema_watch_trigger;
+            END IF;
 
-                     -- RAISE NOTICE ' ev_trg_needed %, ev_trg_exists %', ev_trg_needed, ev_trg_exists;
+            ev_trg_needed := EXISTS (SELECT 1 FROM prostgles.apps WHERE watching_schema IS TRUE);
+            ev_trg_exists := EXISTS (
+                SELECT 1 FROM pg_catalog.pg_event_trigger
+                WHERE evtname = ${(0, exports.asValue)(getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger)}
+            );
 
-                    /**
-                     *  DROP stale event trigger
-                     * */
-                    IF is_super_user IS TRUE AND ev_trg_needed IS FALSE AND ev_trg_exists IS TRUE THEN
+              -- RAISE NOTICE ' ev_trg_needed %, ev_trg_exists %', ev_trg_needed, ev_trg_exists;
 
-                        SELECT format(
-                            $$ DROP EVENT TRIGGER IF EXISTS %I ; $$
-                            , ${(0, exports.asValue)(getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger)}
-                        )
-                        INTO q;
+            /**
+             *  DROP stale event trigger
+             * */
+            IF is_super_user IS TRUE AND ev_trg_needed IS FALSE AND ev_trg_exists IS TRUE THEN
 
-                        --RAISE NOTICE ' DROP EVENT TRIGGER %', q;
+                SELECT format(
+                  $$ DROP EVENT TRIGGER IF EXISTS %I ; $$
+                  , ${(0, exports.asValue)(getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger)}
+                )
+                INTO q;
 
-                        EXECUTE q;
+                --RAISE NOTICE ' DROP EVENT TRIGGER %', q;
 
-                    /**
-                     *  CREATE event trigger
-                     * */
-                    ELSIF 
-                        is_super_user IS TRUE 
-                        AND ev_trg_needed IS TRUE 
-                        AND ev_trg_exists IS FALSE 
-                    THEN
+                EXECUTE q;
 
-                        DROP EVENT TRIGGER IF EXISTS ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger};
-                        CREATE EVENT TRIGGER ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
-                        WHEN TAG IN ('COMMENT', 'CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO')
-                        --WHEN TAG IN ('CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE TRIGGER', 'DROP TRIGGER')
-                        EXECUTE PROCEDURE ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_func}();
+            /**
+             *  CREATE event trigger
+             * */
+            ELSIF 
+                is_super_user IS TRUE 
+                AND ev_trg_needed IS TRUE 
+                AND ev_trg_exists IS FALSE 
+            THEN
 
-                        --RAISE NOTICE ' CREATED EVENT TRIGGER %', q;
-                    END IF;
- 
-                    
-                END
-                $do$; 
-  
+                DROP EVENT TRIGGER IF EXISTS ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger};
+                CREATE EVENT TRIGGER ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
+                WHEN TAG IN ('COMMENT', 'CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO')
+                --WHEN TAG IN ('CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE TRIGGER', 'DROP TRIGGER')
+                EXECUTE PROCEDURE ${getInitQuery_1.DB_OBJ_NAMES.schema_watch_func}();
 
-                COMMIT;
-            `).catch(e => {
+                --RAISE NOTICE ' CREATED EVENT TRIGGER %', q;
+            END IF;
+
+            
+        END
+        $do$; 
+
+
+        COMMIT;
+      `).catch(e => {
                 console.error("prepareTriggers failed: ", e);
                 throw e;
             });

package/lib/PubSubManager/PubSubManager.ts

@@ -185,7 +185,7 @@ export class PubSubManager {
     schema: "schema_has_changed"
   }
   NOTIF_CHANNEL = {
-    preffix: 'prostgles_',
+    preffix: 'prostgles_' as const,
     getFull: (appID?: string) => {
       const finalAppId = appID ?? this.appID;
       if (!finalAppId) throw "No appID";
@@ -253,6 +253,7 @@ export class PubSubManager {
   }
 
   appChecking = false;
+  checkedListenerTableCond?: string[];
   init = initPubSubManager.bind(this);
 
 
@@ -269,106 +270,107 @@ export class PubSubManager {
     try {
 
       await this.db.any(`
-                BEGIN;--  ISOLATION LEVEL SERIALIZABLE;
-                
-                /**                                 ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
-                 *  Drop stale triggers
-                 * */
-                DO
-                $do$
-                  DECLARE trg RECORD;
-                    q   TEXT;
-                    ev_trg_needed BOOLEAN := FALSE;
-                    ev_trg_exists BOOLEAN := FALSE;
-                    is_super_user BOOLEAN := FALSE;
-                BEGIN
-                    --SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-                    
-                    LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
-                    EXECUTE format(
-                      $q$
-
-                        CREATE TEMP TABLE %1$I AS --ON COMMIT DROP AS
-                        SELECT * FROM prostgles.app_triggers;
-
-                        DELETE FROM prostgles.app_triggers;
-
-                        INSERT INTO prostgles.app_triggers
-                        SELECT * FROM %1$I;
-
-                        DROP TABLE IF EXISTS %1$I;
-                      $q$, 
-                      ${asValue('triggers_' + this.appID)}
-                    );
-  
-                    is_super_user := EXISTS (select 1 from pg_user where usename = CURRENT_USER AND usesuper IS TRUE);
-
-                    /**
-                     *  Delete stale app records
-                     * */
-                    DELETE FROM prostgles.apps
-                    WHERE last_check < NOW() - 8 * check_frequency_ms * interval '1 millisecond';
-
-                    DELETE FROM prostgles.app_triggers
-                    WHERE app_id NOT IN (SELECT id FROM prostgles.apps);
-                    
-                    /* DROP the old buggy schema watch trigger */
-                    IF EXISTS (
-                      SELECT 1 FROM pg_catalog.pg_event_trigger
-                      WHERE evtname = 'prostgles_schema_watch_trigger'
-                    ) AND is_super_user IS TRUE 
-                    THEN
-                        DROP EVENT TRIGGER IF EXISTS prostgles_schema_watch_trigger;
-                    END IF;
-
-                    ev_trg_needed := EXISTS (SELECT 1 FROM prostgles.apps WHERE watching_schema IS TRUE);
-                    ev_trg_exists := EXISTS (
-                        SELECT 1 FROM pg_catalog.pg_event_trigger
-                        WHERE evtname = ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
-                    );
-
-                     -- RAISE NOTICE ' ev_trg_needed %, ev_trg_exists %', ev_trg_needed, ev_trg_exists;
-
-                    /**
-                     *  DROP stale event trigger
-                     * */
-                    IF is_super_user IS TRUE AND ev_trg_needed IS FALSE AND ev_trg_exists IS TRUE THEN
-
-                        SELECT format(
-                            $$ DROP EVENT TRIGGER IF EXISTS %I ; $$
-                            , ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
-                        )
-                        INTO q;
-
-                        --RAISE NOTICE ' DROP EVENT TRIGGER %', q;
-
-                        EXECUTE q;
-
-                    /**
-                     *  CREATE event trigger
-                     * */
-                    ELSIF 
-                        is_super_user IS TRUE 
-                        AND ev_trg_needed IS TRUE 
-                        AND ev_trg_exists IS FALSE 
-                    THEN
-
-                        DROP EVENT TRIGGER IF EXISTS ${DB_OBJ_NAMES.schema_watch_trigger};
-                        CREATE EVENT TRIGGER ${DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
-                        WHEN TAG IN ('COMMENT', 'CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO')
-                        --WHEN TAG IN ('CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE TRIGGER', 'DROP TRIGGER')
-                        EXECUTE PROCEDURE ${DB_OBJ_NAMES.schema_watch_func}();
-
-                        --RAISE NOTICE ' CREATED EVENT TRIGGER %', q;
-                    END IF;
- 
-                    
-                END
-                $do$; 
-  
-
-                COMMIT;
-            `).catch(e => {
+        BEGIN;--  ISOLATION LEVEL SERIALIZABLE;
+        
+        /**                                 
+         * ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
+         *  Drop stale triggers
+         * */
+        DO
+        $do$
+          DECLARE trg RECORD;
+            q   TEXT;
+            ev_trg_needed BOOLEAN := FALSE;
+            ev_trg_exists BOOLEAN := FALSE;
+            is_super_user BOOLEAN := FALSE;
+        BEGIN
+            --SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+            
+            LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
+            EXECUTE format(
+              $q$
+
+                CREATE TEMP TABLE %1$I AS --ON COMMIT DROP AS
+                SELECT * FROM prostgles.app_triggers;
+
+                DELETE FROM prostgles.app_triggers;
+
+                INSERT INTO prostgles.app_triggers
+                SELECT * FROM %1$I;
+
+                DROP TABLE IF EXISTS %1$I;
+              $q$, 
+              ${asValue('triggers_' + this.appID)}
+            );
+
+            is_super_user := EXISTS (select 1 from pg_user where usename = CURRENT_USER AND usesuper IS TRUE);
+
+            /**
+             *  Delete stale app records, this will delete related triggers
+             * */
+            DELETE FROM prostgles.apps
+            WHERE last_check < NOW() - 8 * check_frequency_ms * interval '1 millisecond';
+
+            DELETE FROM prostgles.app_triggers
+            WHERE app_id NOT IN (SELECT id FROM prostgles.apps);
+            
+            /* DROP the old buggy schema watch trigger */
+            IF EXISTS (
+              SELECT 1 FROM pg_catalog.pg_event_trigger
+              WHERE evtname = 'prostgles_schema_watch_trigger'
+            ) AND is_super_user IS TRUE 
+            THEN
+                DROP EVENT TRIGGER IF EXISTS prostgles_schema_watch_trigger;
+            END IF;
+
+            ev_trg_needed := EXISTS (SELECT 1 FROM prostgles.apps WHERE watching_schema IS TRUE);
+            ev_trg_exists := EXISTS (
+                SELECT 1 FROM pg_catalog.pg_event_trigger
+                WHERE evtname = ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
+            );
+
+              -- RAISE NOTICE ' ev_trg_needed %, ev_trg_exists %', ev_trg_needed, ev_trg_exists;
+
+            /**
+             *  DROP stale event trigger
+             * */
+            IF is_super_user IS TRUE AND ev_trg_needed IS FALSE AND ev_trg_exists IS TRUE THEN
+
+                SELECT format(
+                  $$ DROP EVENT TRIGGER IF EXISTS %I ; $$
+                  , ${asValue(DB_OBJ_NAMES.schema_watch_trigger)}
+                )
+                INTO q;
+
+                --RAISE NOTICE ' DROP EVENT TRIGGER %', q;
+
+                EXECUTE q;
+
+            /**
+             *  CREATE event trigger
+             * */
+            ELSIF 
+                is_super_user IS TRUE 
+                AND ev_trg_needed IS TRUE 
+                AND ev_trg_exists IS FALSE 
+            THEN
+
+                DROP EVENT TRIGGER IF EXISTS ${DB_OBJ_NAMES.schema_watch_trigger};
+                CREATE EVENT TRIGGER ${DB_OBJ_NAMES.schema_watch_trigger} ON ddl_command_end
+                WHEN TAG IN ('COMMENT', 'CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE VIEW', 'DROP VIEW', 'ALTER VIEW', 'CREATE TABLE AS', 'SELECT INTO')
+                --WHEN TAG IN ('CREATE TABLE', 'ALTER TABLE', 'DROP TABLE', 'CREATE TRIGGER', 'DROP TRIGGER')
+                EXECUTE PROCEDURE ${DB_OBJ_NAMES.schema_watch_func}();
+
+                --RAISE NOTICE ' CREATED EVENT TRIGGER %', q;
+            END IF;
+
+            
+        END
+        $do$; 
+
+
+        COMMIT;
+      `).catch(e => {
         console.error("prepareTriggers failed: ", e);
         throw e;
       });

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

@@ -1 +1 @@
-{"version":3,"file":"getInitQuery.d.ts","sourceRoot":"","sources":["getInitQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9D,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,eAAO,MAAM,YAAY,SAAwB,aAAa,KAAG,QAAQ,MAAM,CA+gB9E,CAAA"}
+{"version":3,"file":"getInitQuery.d.ts","sourceRoot":"","sources":["getInitQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG9D,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,eAAO,MAAM,YAAY,SAAwB,aAAa,KAAG,QAAQ,MAAM,CA6gB9E,CAAA"}

package/lib/PubSubManager/getInitQuery.js

@@ -131,7 +131,6 @@ BEGIN
           added               TIMESTAMP DEFAULT NOW(),
           application_name    TEXT,
           last_check          TIMESTAMP NOT NULL DEFAULT NOW(),
-          last_check_ended    TIMESTAMP NOT NULL DEFAULT NOW(),
           watching_schema     BOOLEAN DEFAULT FALSE,
           check_frequency_ms  INTEGER NOT NULL  
         );
@@ -150,7 +149,7 @@ BEGIN
 
           inserted        TIMESTAMP NOT NULL DEFAULT NOW(),
           last_used       TIMESTAMP NOT NULL DEFAULT NOW(),
-          PRIMARY KEY (app_id, table_name, condition) /* This unqique index limits the condition column value to be less than 'SELECT current_setting('block_size'); */
+          PRIMARY KEY (app_id, table_name, condition) /* This unique index limits the condition column value to be less than 'SELECT current_setting('block_size'); */
         );
         COMMENT ON TABLE prostgles.app_triggers IS 'Tables and conditions that are currently subscribed/synced';
 
@@ -292,7 +291,6 @@ BEGIN
                           RAISE NOTICE 'trigger dropped due to exception: % % %', err_text, err_detail, err_hint;
 
                         END IF;
-
                         
                     END IF;
                 END IF;
@@ -503,12 +501,12 @@ BEGIN
                     SELECT LEFT(COALESCE(current_query(), ''), 5000)
                     INTO curr_query;
                     
-                    FOR arw IN 
+                    FOR app IN 
                       SELECT * FROM prostgles.apps WHERE watching_schema IS TRUE
 
                     LOOP
                       PERFORM pg_notify( 
-                        ${(0, PubSubManager_1.asValue)(this.NOTIF_CHANNEL.preffix)} || arw.id, 
+                        ${(0, PubSubManager_1.asValue)(this.NOTIF_CHANNEL.preffix)} || app.id, 
                         concat_ws(
                           ${(0, PubSubManager_1.asValue)(PubSubManager_1.PubSubManager.DELIMITER)}, 
                           ${(0, PubSubManager_1.asValue)(this.NOTIF_TYPE.schema)}, tg_tag , TG_event, curr_query

package/lib/PubSubManager/getInitQuery.ts

@@ -133,7 +133,6 @@ BEGIN
           added               TIMESTAMP DEFAULT NOW(),
           application_name    TEXT,
           last_check          TIMESTAMP NOT NULL DEFAULT NOW(),
-          last_check_ended    TIMESTAMP NOT NULL DEFAULT NOW(),
           watching_schema     BOOLEAN DEFAULT FALSE,
           check_frequency_ms  INTEGER NOT NULL  
         );
@@ -152,7 +151,7 @@ BEGIN
 
           inserted        TIMESTAMP NOT NULL DEFAULT NOW(),
           last_used       TIMESTAMP NOT NULL DEFAULT NOW(),
-          PRIMARY KEY (app_id, table_name, condition) /* This unqique index limits the condition column value to be less than 'SELECT current_setting('block_size'); */
+          PRIMARY KEY (app_id, table_name, condition) /* This unique index limits the condition column value to be less than 'SELECT current_setting('block_size'); */
         );
         COMMENT ON TABLE prostgles.app_triggers IS 'Tables and conditions that are currently subscribed/synced';
 
@@ -294,7 +293,6 @@ BEGIN
                           RAISE NOTICE 'trigger dropped due to exception: % % %', err_text, err_detail, err_hint;
 
                         END IF;
-
                         
                     END IF;
                 END IF;
@@ -505,12 +503,12 @@ BEGIN
                     SELECT LEFT(COALESCE(current_query(), ''), 5000)
                     INTO curr_query;
                     
-                    FOR arw IN 
+                    FOR app IN 
                       SELECT * FROM prostgles.apps WHERE watching_schema IS TRUE
 
                     LOOP
                       PERFORM pg_notify( 
-                        ${asValue(this.NOTIF_CHANNEL.preffix)} || arw.id, 
+                        ${asValue(this.NOTIF_CHANNEL.preffix)} || app.id, 
                         concat_ws(
                           ${asValue(PubSubManager.DELIMITER)}, 
                           ${asValue(this.NOTIF_TYPE.schema)}, tg_tag , TG_event, curr_query

package/lib/PubSubManager/initPubSubManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initPubSubManager.d.ts","sourceRoot":"","sources":["initPubSubManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI9D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAwH/F"}
+{"version":3,"file":"initPubSubManager.d.ts","sourceRoot":"","sources":["initPubSubManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI9D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA6H/F"}

package/lib/PubSubManager/initPubSubManager.js

@@ -19,11 +19,42 @@ async function initPubSubManager() {
             this.appID = raw.id;
             if (!this.appCheck) {
                 this.appCheck = setInterval(async () => {
-                    let appQ = "";
+                    let checkForStaleTriggers = "";
                     try { //  drop owned by api
                         this.appChecking = true;
                         const listeners = this.getActiveListeners();
-                        appQ = `                          
+                        const checkedListenerTableCond = listeners.map(l => `${l.table_name}.${l.condition}`);
+                        let dataTriggerCheckQuery = "";
+                        if (this.checkedListenerTableCond?.sort().join() !== checkedListenerTableCond.sort().join()) {
+                            this.checkedListenerTableCond = checkedListenerTableCond;
+                            dataTriggerCheckQuery = `
+                /* Delete unused triggers. Might deadlock */
+                IF EXISTS ( SELECT 1 FROM prostgles.app_triggers) 
+                    
+                THEN
+
+                    /* TODO: Fixed deadlocks */
+                    --LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
+
+                    /* UPDATE currently used triggers */
+                    ${!listeners.length ? "" : `
+                      UPDATE prostgles.app_triggers
+                      SET last_used = CASE WHEN (table_name, condition) IN (
+                        ${listeners.map(l => ` ( ${(0, PubSubManager_1.asValue)(l.table_name)}, ${(0, PubSubManager_1.asValue)(l.condition)} ) `).join(", ")}
+                      ) THEN NOW() ELSE last_used END
+                      WHERE app_id = ${(0, PubSubManager_1.asValue)(this.appID)};
+                    `}
+
+                    /* DELETE stale triggers for current app. Other triggers will be deleted on app startup */
+                    DELETE FROM prostgles.app_triggers
+                    WHERE app_id = ${(0, PubSubManager_1.asValue)(this.appID)}
+                    AND last_used < NOW() - 4 * ${(0, PubSubManager_1.asValue)(this.appCheckFrequencyMS)} * interval '1 millisecond'; -- 10 seconds at the moment
+
+                END IF;
+              
+              `;
+                        }
+                        checkForStaleTriggers = `                          
               DO $$
               BEGIN
 
@@ -41,46 +72,17 @@ async function initPubSubManager() {
                     )
                   THEN
  
+                      /* Last check used to remove disconnected apps */
                       UPDATE prostgles.apps 
                       SET last_check = NOW()
                       WHERE id = ${(0, PubSubManager_1.asValue)(this.appID)};
 
-
-
-                      /* Delete unused triggers. Might deadlock */
-                      IF EXISTS ( SELECT 1 FROM prostgles.app_triggers) 
-                          
-                      THEN
-
-                          /* TODO: Fixed deadlocks */
-                          --LOCK TABLE prostgles.app_triggers IN ACCESS EXCLUSIVE MODE;
-
-                          /* UPDATE currently used triggers */
-                          ${!listeners.length ? "" : `
-                            UPDATE prostgles.app_triggers
-                            SET last_used = CASE WHEN (table_name, condition) IN (
-                              ${listeners.map(l => ` ( ${(0, PubSubManager_1.asValue)(l.table_name)}, ${(0, PubSubManager_1.asValue)(l.condition)} ) `).join(", ")}
-                            ) THEN NOW() ELSE last_used END
-                            WHERE app_id = ${(0, PubSubManager_1.asValue)(this.appID)};
-                          `}
-
-                          /* DELETE stale triggers for current app. Other triggers will be deleted on app startup */
-                          DELETE FROM prostgles.app_triggers
-                          WHERE app_id = ${(0, PubSubManager_1.asValue)(this.appID)}
-                          AND last_used < NOW() - 4 * ${(0, PubSubManager_1.asValue)(this.appCheckFrequencyMS)} * interval '1 millisecond'; -- 10 seconds at the moment
-
-                      END IF;
-
-                      UPDATE prostgles.apps 
-                      SET last_check_ended = NOW()
-                      WHERE id = ${(0, PubSubManager_1.asValue)(this.appID)};
-
-
+                      ${dataTriggerCheckQuery}
                   END IF;
  
               END $$;
           `;
-                        await this.db.any(appQ);
+                        await this.db.any(checkForStaleTriggers);
                         tries = 5;
                         (0, PubSubManager_1.log)("updated last_check");
                     }
@@ -97,7 +99,7 @@ async function initPubSubManager() {
                         if (tries <= 0 || e?.code === "3D000") { //  && e.message.includes(this.db.$cn.database)
                             clearInterval(this.appCheck);
                         }
-                        console.error("appCheck FAILED: \n", e, appQ);
+                        console.error("appCheck FAILED: \n", e, checkForStaleTriggers);
                     }
                     this.appChecking = false;
                 }, 0.8 * this.appCheckFrequencyMS);