regress: fix test instability

Having additional triggers in a test table made the ORDER BY clauses in
old queries underspecified.  Add another column there for stability.

Per sporadic buildfarm pink.

diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index cd07112d99d7de975e29f7afabea8a36d682bb9d..9f60aea433bff036231b9229ab83fa8d37f82d2e 100644 (file)
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -2659,7 +2659,7 @@ create trigger tg_stmt after insert on parent
   for statement execute procedure trig_nothing();
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
  tgrelid | tgname  | tgenabled 
 ---------+---------+-----------
  child1  | tg      | O
@@ -2671,7 +2671,7 @@ alter table only parent enable always trigger tg; -- no recursion because ONLY
 alter table parent enable always trigger tg_stmt;  -- no recursion because statement trigger
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
  tgrelid | tgname  | tgenabled 
 ---------+---------+-----------
  child1  | tg      | O
@@ -2684,7 +2684,7 @@ select tgrelid::regclass, tgname, tgenabled from pg_trigger
 alter table parent enable always trigger tg;
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
  tgrelid | tgname  | tgenabled 
 ---------+---------+-----------
  child1  | tg      | A

diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql
index 10e3c931f9af1a86b7af1a2c35179fb5957d224a..626608a1a6ce84bddcec249afe7ac84f7e2b7969 100644 (file)
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -1836,18 +1836,18 @@ create trigger tg_stmt after insert on parent
   for statement execute procedure trig_nothing();
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
 alter table only parent enable always trigger tg;  -- no recursion because ONLY
 alter table parent enable always trigger tg_stmt;  -- no recursion because statement trigger
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
 -- The following is a no-op for the parent trigger but not so
 -- for the child trigger, so recursion should be applied.
 alter table parent enable always trigger tg;
 select tgrelid::regclass, tgname, tgenabled from pg_trigger
   where tgrelid in ('parent'::regclass, 'child1'::regclass)
-  order by tgrelid::regclass::text;
+  order by tgrelid::regclass::text, tgname;
 drop table parent, child1;
 
 -- Verify that firing state propagates correctly on creation, too