prostgles-server 4.2.63 → 4.2.64

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;AAGpF,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,eAAO,MAAM,YAAY,SAAwB,aAAa,KAAG,QAAQ,MAAM,CAwjB9E,CAAA"}
+{"version":3,"file":"getInitQuery.d.ts","sourceRoot":"","sources":["../../lib/PubSubManager/getInitQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAsC,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGpF,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,eAAO,MAAM,YAAY,SAAwB,aAAa,KAAG,QAAQ,MAAM,CAkkB9E,CAAA"}

package/dist/PubSubManager/getInitQuery.js

@@ -201,13 +201,15 @@ BEGIN
 
             BEGIN
 
-                -- PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
+                --PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
 
                 SELECT string_agg(
                   format(
                     $c$ 
                       SELECT CASE WHEN EXISTS( 
-                        SELECT 1 FROM %I WHERE %s 
+                        SELECT 1 
+                        FROM %s 
+                        WHERE %s 
                       ) THEN %s::text END AS t_ids 
                     $c$, 
                     table_name, 
@@ -218,7 +220,7 @@ BEGIN
                 ) 
                 INTO unions
                 FROM prostgles.v_triggers
-                WHERE table_name = TG_TABLE_NAME;
+                WHERE table_name = format(TG_TABLE_NAME, '%I');
 
 
                 /* unions = 'old_table union new_table' or any one of the tables */
@@ -240,7 +242,7 @@ BEGIN
                         FROM (
                           SELECT DISTINCT related_view_name, related_view_def 
                           FROM prostgles.v_triggers
-                          WHERE table_name = TG_TABLE_NAME
+                          WHERE table_name = format(TG_TABLE_NAME, '%I')
                           AND related_view_name IS NOT NULL
                           AND related_view_def  IS NOT NULL
                         ) t
@@ -252,7 +254,8 @@ BEGIN
                             FROM ( 
                               %s 
                             ) t
-                        $c$, unions
+                        $c$, 
+                        unions
                       )
                     INTO query; 
 
@@ -354,12 +357,18 @@ BEGIN
                         SELECT DISTINCT table_name 
                         FROM old_table ot
                         WHERE NOT EXISTS (
-                          SELECT 1 FROM prostgles.app_triggers t 
+                          SELECT 1 
+                          FROM prostgles.app_triggers t 
                           WHERE t.table_name = ot.table_name
                         )
                         AND EXISTS (
-                          SELECT trigger_name from information_schema.triggers 
-                          WHERE trigger_name = 'your_trigger_name'
+                          SELECT trigger_name 
+                          FROM information_schema.triggers 
+                          WHERE trigger_name IN (
+                            concat_ws('_', 'prostgles_triggers', table_name, 'insert'),
+                            concat_ws('_', 'prostgles_triggers', table_name, 'update'),
+                            concat_ws('_', 'prostgles_triggers', table_name, 'delete')
+                          )
                         )
                     LOOP
 
@@ -368,7 +377,7 @@ BEGIN
                             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 ;', trg_name, trw.table_name);
+                            EXECUTE format(' ALTER TABLE %s DISABLE TRIGGER %I ;', trw.table_name, trg_name);
                         END LOOP;
                                       
                     END LOOP;
@@ -395,13 +404,14 @@ BEGIN
                             AND   t.inserted   < nt.inserted    -- exclude current record (this is an after trigger). Turn into before trigger?
                         )
 
-                        /* Table is valid */
+                        /* Table is valid 
                         AND  EXISTS (
                             SELECT 1 
                             FROM information_schema.tables 
                             WHERE  table_schema = 'public'
                             AND    table_name   = nt.table_name
                         )
+                        */
                     LOOP
 
                         IF (
@@ -445,7 +455,7 @@ BEGIN
                               $q$ 
                                   DROP TRIGGER IF EXISTS %1$I ON %2$s;
                                   CREATE TRIGGER %1$I
-                                  AFTER DELETE ON %2$I
+                                  AFTER DELETE ON %2$s
                                   REFERENCING OLD TABLE AS old_table
                                   FOR EACH STATEMENT EXECUTE PROCEDURE ${exports.DB_OBJ_NAMES.data_watch_func}();
                                   COMMENT ON TRIGGER %1$I ON %2$s IS 'Prostgles internal trigger used to notify when data in the table changed';

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/lib/PubSubManager/getInitQuery.ts

@@ -203,13 +203,15 @@ BEGIN
 
             BEGIN
 
-                -- PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
+                --PERFORM pg_notify('debug', concat_ws(' ', 'TABLE', TG_TABLE_NAME, TG_OP));
 
                 SELECT string_agg(
                   format(
                     $c$ 
                       SELECT CASE WHEN EXISTS( 
-                        SELECT 1 FROM %I WHERE %s 
+                        SELECT 1 
+                        FROM %s 
+                        WHERE %s 
                       ) THEN %s::text END AS t_ids 
                     $c$, 
                     table_name, 
@@ -220,7 +222,7 @@ BEGIN
                 ) 
                 INTO unions
                 FROM prostgles.v_triggers
-                WHERE table_name = TG_TABLE_NAME;
+                WHERE table_name = format(TG_TABLE_NAME, '%I');
 
 
                 /* unions = 'old_table union new_table' or any one of the tables */
@@ -242,7 +244,7 @@ BEGIN
                         FROM (
                           SELECT DISTINCT related_view_name, related_view_def 
                           FROM prostgles.v_triggers
-                          WHERE table_name = TG_TABLE_NAME
+                          WHERE table_name = format(TG_TABLE_NAME, '%I')
                           AND related_view_name IS NOT NULL
                           AND related_view_def  IS NOT NULL
                         ) t
@@ -254,7 +256,8 @@ BEGIN
                             FROM ( 
                               %s 
                             ) t
-                        $c$, unions
+                        $c$, 
+                        unions
                       )
                     INTO query; 
 
@@ -356,12 +359,18 @@ BEGIN
                         SELECT DISTINCT table_name 
                         FROM old_table ot
                         WHERE NOT EXISTS (
-                          SELECT 1 FROM prostgles.app_triggers t 
+                          SELECT 1 
+                          FROM prostgles.app_triggers t 
                           WHERE t.table_name = ot.table_name
                         )
                         AND EXISTS (
-                          SELECT trigger_name from information_schema.triggers 
-                          WHERE trigger_name = 'your_trigger_name'
+                          SELECT trigger_name 
+                          FROM information_schema.triggers 
+                          WHERE trigger_name IN (
+                            concat_ws('_', 'prostgles_triggers', table_name, 'insert'),
+                            concat_ws('_', 'prostgles_triggers', table_name, 'update'),
+                            concat_ws('_', 'prostgles_triggers', table_name, 'delete')
+                          )
                         )
                     LOOP
 
@@ -370,7 +379,7 @@ BEGIN
                             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 ;', trg_name, trw.table_name);
+                            EXECUTE format(' ALTER TABLE %s DISABLE TRIGGER %I ;', trw.table_name, trg_name);
                         END LOOP;
                                       
                     END LOOP;
@@ -397,13 +406,14 @@ BEGIN
                             AND   t.inserted   < nt.inserted    -- exclude current record (this is an after trigger). Turn into before trigger?
                         )
 
-                        /* Table is valid */
+                        /* Table is valid 
                         AND  EXISTS (
                             SELECT 1 
                             FROM information_schema.tables 
                             WHERE  table_schema = 'public'
                             AND    table_name   = nt.table_name
                         )
+                        */
                     LOOP
 
                         IF (
@@ -447,7 +457,7 @@ BEGIN
                               $q$ 
                                   DROP TRIGGER IF EXISTS %1$I ON %2$s;
                                   CREATE TRIGGER %1$I
-                                  AFTER DELETE ON %2$I
+                                  AFTER DELETE ON %2$s
                                   REFERENCING OLD TABLE AS old_table
                                   FOR EACH STATEMENT EXECUTE PROCEDURE ${DB_OBJ_NAMES.data_watch_func}();
                                   COMMENT ON TRIGGER %1$I ON %2$s IS 'Prostgles internal trigger used to notify when data in the table changed';

package/package.json

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

package/tests/isomorphicQueries.spec.ts

@@ -991,21 +991,28 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
       assert.deepStrictEqual(exists1, exists2)
     });
 
-    await test("subscribe to escaped table name", async () => {
-      await tryRunP("subscribe to escaped table name", async (resolve, reject) => {
-        let sub;
-        sub = await db[`"""quoted0"""`].subscribe!({ [`"text_col0"`]: "0" }, {  }, async items => {
-          const item = items[0];
-          
-          if(item && item[`"text_col0"`] === "0"){
-            setTimeout(async () => {
-              await sub.unsubscribe();
-              resolve(true);
-            }, 50);
-          }
-        });
-      });
-    });
+    // await test("subscribe to escaped table name", async () => {
+    //   await tryRunP("subscribe to escaped table name", async (resolve, reject) => {
+    //     // await tout(11000);
+    //     const filter = { [`"text_col0"`]: "0" }
+    //     let runs = 0;
+    //     const sub = await db[`"""quoted0"""`].subscribe!(filter, {  }, async items => {
+    //       const item = items[0];
+    //       if(item && item[`"text_col0"`] === "0"){
+    //         if(!runs){
+    //           db[`"""quoted0"""`].update!(filter, filter);
+    //           log(JSON.stringify(items))
+    //         }
+    //         runs++;
+    //         if(runs < 2){
+    //           return;
+    //         }
+    //         await sub.unsubscribe();
+    //         resolve(true);
+    //       }
+    //     });
+    //   });
+    // });
 
     await test("Reverse join with agg", async () => {
       const inserted = await db.tr1.insert!({ tr2: { t1: "a", t2: "b" } }, { returning: "*" });
@@ -1024,15 +1031,19 @@ export const isomorphicQueries = async (db: DBOFullyTyped | DBHandlerClient, log
     });
 
     await test("Related table subscribe", async () => {
-      const sub = await db.tr1.subscribe!({}, {
-        select: {
-          "*": 1,
-          tr2: "*",
-          tr3: "*",
-        }
-      },  _rows => {
+      const sub = await db.tr1.subscribe!(
+        {}, 
+        {
+          select: {
+            "*": 1,
+            tr2: "*",
+            tr3: "*",
+          }
+        },  
+        _rows => {
 
-      });
+        }
+      );
 
       await sub.unsubscribe();
     });

package/tests/server/DBoGenerated.d.ts

@@ -505,6 +505,16 @@ export type DBSchemaGenerated = {
       symbol: string;
     };
   };
+  unions: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      string_agg?: null | string;
+    };
+  };
   users: {
     is_view: false;
     select: true;

package/tests/server/package-lock.json

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