From 85290d4e61df24eb1205a97cccf7c678559d5d3a Mon Sep 17 00:00:00 2001 From: Pravesh Sharma Date: Tue, 18 Feb 2025 11:57:42 +0530 Subject: [PATCH] Fixed an issue where the column order displayed was incorrect for exclusion constraints with multiple columns. #8430 --- .../tests/11_plus/create_exclusion_constraint_exp.sql | 4 ++-- .../tests/default/create_exclusion_constraint_exp.sql | 4 ++-- .../exclusion_constraint/sql/default/get_constraint_cols.sql | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql index 0d83f32e1..de8254a77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql @@ -4,8 +4,8 @@ ALTER TABLE IF EXISTS testschema.tableforexclusion ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING gist ( - (col1 + col3) WITH <>, - col2 WITH <>) + col2 WITH <>, + (col1 + col3) WITH <>) WITH (FILLFACTOR=12) WHERE (col1 > 1) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_exp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_exp.sql index 0d83f32e1..de8254a77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_exp.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_exp.sql @@ -4,8 +4,8 @@ ALTER TABLE IF EXISTS testschema.tableforexclusion ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING gist ( - (col1 + col3) WITH <>, - col2 WITH <>) + col2 WITH <>, + (col1 + col3) WITH <>) WITH (FILLFACTOR=12) WHERE (col1 > 1) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/get_constraint_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/get_constraint_cols.sql index 56f830362..325656de8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/get_constraint_cols.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/get_constraint_cols.sql @@ -3,6 +3,7 @@ UNION {% endif %} SELECT + a.attnum, i.indoption[{{loop.index -1}}] AS options, pg_catalog.pg_get_indexdef(i.indexrelid, {{loop.index}}, true) AS coldef, op.oprname, @@ -21,3 +22,4 @@ LEFT OUTER JOIN pg_catalog.pg_collation coll ON a.attcollation=coll.oid LEFT OUTER JOIN pg_catalog.pg_namespace nspc ON coll.collnamespace=nspc.oid WHERE i.indexrelid = {{cid}}::oid {% endfor %} +ORDER BY attnum \ No newline at end of file