IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-20 11:48:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Display event trigger functions correctly on EPAS. Fixes #3549

Browse Source
This commit is contained in:
Akshay Joshi 2019-01-04 13:06:45 +00:00 committed by Dave Page
parent b5c7a108ab
commit 4e27bf989f
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_3_7.rst
View File

@ -19,6 +19,7 @@ Bug fixes
| `Bug #3083 <https://redmine.postgresql.org/issues/3083>`_ - Increase the size of the resize handle of the edit grid text pop-out. | `Bug #3083 <https://redmine.postgresql.org/issues/3083>`_ - Increase the size of the resize handle of the edit grid text pop-out.
| `Bug #3354 <https://redmine.postgresql.org/issues/3354>`_ - Fix handling of array types as inputs to the debugger. | `Bug #3354 <https://redmine.postgresql.org/issues/3354>`_ - Fix handling of array types as inputs to the debugger.
| `Bug #3433 <https://redmine.postgresql.org/issues/3433>`_ - Fix an issue that could cause the Query Tool to fail to render. | `Bug #3433 <https://redmine.postgresql.org/issues/3433>`_ - Fix an issue that could cause the Query Tool to fail to render.
| `Bug #3549 <https://redmine.postgresql.org/issues/3549>`_ - Display event trigger functions correctly on EPAS.
| `Bug #3559 <https://redmine.postgresql.org/issues/3559>`_ - Further improvements to treeview restoration. | `Bug #3559 <https://redmine.postgresql.org/issues/3559>`_ - Further improvements to treeview restoration.
| `Bug #3599 <https://redmine.postgresql.org/issues/3599>`_ - Run Postfix in the container build so passwords can be reset etc. | `Bug #3599 <https://redmine.postgresql.org/issues/3599>`_ - Run Postfix in the container build so passwords can be reset etc.
| `Bug #3619 <https://redmine.postgresql.org/issues/3619>`_ - Add titles to the code areas of the Query Tool and Debugger to ensure that panels can be re-docked within them. | `Bug #3619 <https://redmine.postgresql.org/issues/3619>`_ - Add titles to the code areas of the Query Tool and Debugger to ensure that panels can be re-docked within them.

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/coll_stats.sql
View File

@ -15,6 +15,6 @@ WHERE
pg_type typ ON typ.oid=p.prorettype pg_type typ ON typ.oid=p.prorettype
WHERE WHERE
p.prokind IN ('f', 'w') p.prokind IN ('f', 'w')
AND typname = 'trigger' AND typname IN ('trigger', 'event_trigger')
) )
ORDER BY funcname; ORDER BY funcname;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/delete.sql
View File

@ -12,7 +12,7 @@ JOIN
WHERE WHERE
pr.prokind IN ('f', 'w') pr.prokind IN ('f', 'w')
AND pronamespace = {{scid}}::oid AND pronamespace = {{scid}}::oid
AND typname = 'trigger' AND typname IN ('trigger', 'event_trigger')
AND pr.oid = {{fnid}}; AND pr.oid = {{fnid}};
{% endif %} {% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/node.sql
View File

@ -17,6 +17,6 @@ WHERE
{% if scid %} {% if scid %}
AND pronamespace = {{scid}}::oid AND pronamespace = {{scid}}::oid
{% endif %} {% endif %}
AND typname = 'trigger' AND lanname != 'edbspl' AND typname IN ('trigger', 'event_trigger') AND lanname != 'edbspl'
ORDER BY ORDER BY
proname; proname;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/properties.sql
View File

@ -22,7 +22,7 @@ LEFT OUTER JOIN
pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass)
WHERE WHERE
pr.prokind IN ('f', 'w') pr.prokind IN ('f', 'w')
AND typname = 'trigger' AND lanname != 'edbspl' AND typname IN ('trigger', 'event_trigger') AND lanname != 'edbspl'
{% if fnid %} {% if fnid %}
AND pr.oid = {{fnid}}::oid AND pr.oid = {{fnid}}::oid
{% else %} {% else %}