From 9b5a6e2bb752eb71093fc59430c828f80558fb8e Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Wed, 24 Apr 2019 11:35:20 +0100 Subject: [PATCH] Prevent duplicate columns being included in reverse engineered SQL for tables. Fixes #4163 --- docs/en_US/release_notes_4_6.rst | 1 + .../schemas/tables/templates/column/sql/10_plus/properties.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en_US/release_notes_4_6.rst b/docs/en_US/release_notes_4_6.rst index 4c192fd3f..ad7bf8904 100644 --- a/docs/en_US/release_notes_4_6.rst +++ b/docs/en_US/release_notes_4_6.rst @@ -28,4 +28,5 @@ Bug fixes | `Bug #4138 `_ - Fix an issue where the dropdown becomes misaligned/displaced. | `Bug #4160 `_ - Fixed 'Increment value cannot be empty' error for existing tables. | `Bug #4161 `_ - Ensure that parameters of procedures for EPAS server 10 and below should be set/reset properly. +| `Bug #4163 `_ - Prevent duplicate columns being included in reverse engineered SQL for tables. | `Bug #4182 `_ - Ensure sanity of the permissions on the storage and session directories and the config database. \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/properties.sql index 186f5185a..acfccb096 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/properties.sql @@ -33,7 +33,7 @@ FROM pg_attribute att LEFT OUTER JOIN pg_index pi ON pi.indrelid=att.attrelid AND indisprimary LEFT OUTER JOIN pg_collation coll ON att.attcollation=coll.oid LEFT OUTER JOIN pg_namespace nspc ON coll.collnamespace=nspc.oid - LEFT OUTER JOIN pg_depend dep ON dep.refobjid = att.attrelid AND dep.refobjsubid = att.attnum AND dep.classid IN ( SELECT oid FROM pg_class WHERE relname IN ('pg_class')) LEFT JOIN pg_sequence seq ON dep.objid=seq.seqrelid + LEFT OUTER JOIN pg_sequence seq ON cs.oid=seq.seqrelid WHERE att.attrelid = {{tid}}::oid {% if clid %} AND att.attnum = {{clid}}::int