Fixed an issue where the column order displayed was incorrect for exc…

…lusion constraints with multiple columns. #8430
pgadmin-org · Feb 18, 2025 · 85290d4 · 85290d4
1 parent 48a26e8
commit 85290d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql b/...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/...tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_exp.sql b/...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/...tabases/schemas/tables/templates/exclusion_constraint/sql/default/get_constraint_cols.sql b/...tabases/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