aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2022-08-05 11:55:52 +0200
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2022-08-05 11:55:52 +0200
commitd2a74621ed0430094e6d1f754df5bc1647408be7 (patch)
tree4ea8cfc47ad41c69d441016a227be5d21b5b1a6e
parentab855663012c131bba8d16e6188eed0b627a27bc (diff)
downloadpostgresql-d2a74621ed0430094e6d1f754df5bc1647408be7.tar.gz
postgresql-d2a74621ed0430094e6d1f754df5bc1647408be7.zip
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.
-rw-r--r--src/test/regress/expected/triggers.out6
-rw-r--r--src/test/regress/sql/triggers.sql6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 8c3bee2bf17..6842e257e7b 100644
--- 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 b9c49c2cb78..c57f4171a7f 100644
--- 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