From 41e2a674e37c530c9a15de196cd8b5ba228f38f3 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Tue, 20 Aug 2019 17:09:26 +0530 Subject: [PATCH] Fix Truncate option deselect issue for compound triggers. Fixes #4643 --- docs/en_US/release_notes_4_13.rst | 3 ++- .../templates/compound_triggers/sql/ppas/12_plus/update.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_4_13.rst b/docs/en_US/release_notes_4_13.rst index 0161c9bca..ea4c67c32 100644 --- a/docs/en_US/release_notes_4_13.rst +++ b/docs/en_US/release_notes_4_13.rst @@ -18,4 +18,5 @@ Bug fixes ********* | `Issue #2706 `_ - Added ProjectSet icon for explain module. -| `Issue #2828 `_ - Added Gather Merge, Named Tuple Store Scan and Table Function Scan icon for explain module. \ No newline at end of file +| `Issue #2828 `_ - Added Gather Merge, Named Tuple Store Scan and Table Function Scan icon for explain module. +| `Issue #4643 `_ - Fix Truncate option deselect issue for compound triggers. \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/update.sql index 51308dab7..bce89f525 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/update.sql @@ -3,7 +3,7 @@ ALTER TRIGGER {{ conn|qtIdent(o_data.name) }} ON {{ conn|qtIdent(o_data.nspname, RENAME TO {{ conn|qtIdent(data.name) }}; {% endif %} -{% if ((data.prosrc is defined or data.evnt_insert is defined or data.evnt_delete is defined or data.evnt_update is defined) and (o_data.prosrc != data.prosrc or data.evnt_insert != o_data.evnt_insert or data.evnt_delete != o_data.evnt_delete or data.evnt_update != o_data.evnt_update)) %} +{% if ((data.prosrc is defined or data.evnt_insert is defined or data.evnt_delete is defined or data.evnt_truncate is defined or data.evnt_update is defined) and (o_data.prosrc != data.prosrc or data.evnt_insert != o_data.evnt_insert or data.evnt_delete != o_data.evnt_delete or data.evnt_truncate != o_data.evnt_truncate or data.evnt_update != o_data.evnt_update)) %} {% set or_flag = False %} CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} FOR {% if data.evnt_insert is not defined %}{% if o_data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% else %}{% if data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% endif %}{% if data.evnt_delete is not defined %}{% if o_data.evnt_delete %}