diff --git a/docs/en_US/release_notes_3_7.rst b/docs/en_US/release_notes_3_7.rst index 38ea7671a..ab64d1e8f 100644 --- a/docs/en_US/release_notes_3_7.rst +++ b/docs/en_US/release_notes_3_7.rst @@ -19,6 +19,7 @@ Bug fixes | `Bug #3083 `_ - Increase the size of the resize handle of the edit grid text pop-out. | `Bug #3354 `_ - Fix handling of array types as inputs to the debugger. | `Bug #3433 `_ - Fix an issue that could cause the Query Tool to fail to render. +| `Bug #3549 `_ - Display event trigger functions correctly on EPAS. | `Bug #3559 `_ - Further improvements to treeview restoration. | `Bug #3599 `_ - Run Postfix in the container build so passwords can be reset etc. | `Bug #3619 `_ - Add titles to the code areas of the Query Tool and Debugger to ensure that panels can be re-docked within them. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/coll_stats.sql index cd8cecdfe..9879f43ee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/coll_stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/coll_stats.sql @@ -15,6 +15,6 @@ WHERE pg_type typ ON typ.oid=p.prorettype WHERE p.prokind IN ('f', 'w') - AND typname = 'trigger' + AND typname IN ('trigger', 'event_trigger') ) ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/delete.sql index a2d698bc0..f7f906b3b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/delete.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/delete.sql @@ -12,7 +12,7 @@ JOIN WHERE pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid - AND typname = 'trigger' + AND typname IN ('trigger', 'event_trigger') AND pr.oid = {{fnid}}; {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/node.sql index 592ef754e..70119f4f7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/node.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/node.sql @@ -17,6 +17,6 @@ WHERE {% if scid %} AND pronamespace = {{scid}}::oid {% endif %} - AND typname = 'trigger' AND lanname != 'edbspl' + AND typname IN ('trigger', 'event_trigger') AND lanname != 'edbspl' ORDER BY proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/properties.sql index 7fc529b97..7de1ef21b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/properties.sql @@ -22,7 +22,7 @@ LEFT OUTER JOIN pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE pr.prokind IN ('f', 'w') - AND typname = 'trigger' AND lanname != 'edbspl' + AND typname IN ('trigger', 'event_trigger') AND lanname != 'edbspl' {% if fnid %} AND pr.oid = {{fnid}}::oid {% else %}