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 f131405bc7a709808810472ebd2e37603f0d1df3..8fe42ec5604da42b324f7fd7316391b3b3dc70b2 100644 (file)
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -2685,7 +2685,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
@@ -2697,7 +2697,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
@@ -2710,7 +2710,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 cb6fc4a90ee32b01110a78245180f8cf7700fe07..9d21bbe2a9430f303dc04ce607c2db3f93fe339e 100644 (file)
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -1869,18 +1869,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