From dd7eb54e904734cd5bb681c038f2c79ff7d3bf79 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Thu, 30 Jul 2020 13:57:00 +0530 Subject: [PATCH] Fixed an issue when comparing the table with a trigger throwing error in schema diff. Fixes #5710 --- docs/en_US/release_notes_4_25.rst | 3 ++- .../databases/schemas/tables/compound_triggers/__init__.py | 2 +- .../servers/databases/schemas/tables/rules/__init__.py | 2 +- .../servers/databases/schemas/tables/triggers/__init__.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/en_US/release_notes_4_25.rst b/docs/en_US/release_notes_4_25.rst index 0c1f63a25..622ddc865 100644 --- a/docs/en_US/release_notes_4_25.rst +++ b/docs/en_US/release_notes_4_25.rst @@ -26,4 +26,5 @@ Bug fixes | `Issue #5490 `_ - Make the runtime configuration dialog non-modal. | `Issue #5632 `_ - Ensure that the user will be able to modify the start value of the Identity column. | `Issue #5646 `_ - Ensure that RLS Policy node should be searchable using search object. -| `Issue #5708 `_ - Correct TLS certificate filename in the container deployment docs. \ No newline at end of file +| `Issue #5708 `_ - Correct TLS certificate filename in the container deployment docs. +| `Issue #5710 `_ - Fixed an issue when comparing the table with a trigger throwing error in schema diff. \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py index d11fad110..7dda58823 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py @@ -884,7 +884,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare): sid = kwargs.get('sid') did = kwargs.get('did') scid = kwargs.get('scid') - tid = kwargs.get('oid') + tid = kwargs.get('tid') oid = kwargs.get('oid') data = kwargs.get('data', None) diff_schema = kwargs.get('diff_schema', None) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py index 0572bfbc6..88520b3d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py @@ -528,7 +528,7 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare): sid = kwargs.get('sid') did = kwargs.get('did') scid = kwargs.get('scid') - tid = kwargs.get('oid') + tid = kwargs.get('tid') oid = kwargs.get('oid') data = kwargs.get('data', None) source_schema = kwargs.get('source_schema', None) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index 10dc39ceb..ae5bd4343 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -802,7 +802,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare): sid = kwargs.get('sid') did = kwargs.get('did') scid = kwargs.get('scid') - tid = kwargs.get('oid') + tid = kwargs.get('tid') oid = kwargs.get('oid') data = kwargs.get('data', None) diff_schema = kwargs.get('diff_schema', None)