aboutsummaryrefslogtreecommitdiff
path: root/src
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
commit90a4b64134ce0cb9a31cdceb49e265e8e2f88b56 (patch)
tree2876d918de1f04f958b665218553f6b8dc0efbd8 /src
parent6b41a1579bd37aa95924d592d7a18a79d669662f (diff)
downloadpostgresql-90a4b64134ce0cb9a31cdceb49e265e8e2f88b56.tar.gz
postgresql-90a4b64134ce0cb9a31cdceb49e265e8e2f88b56.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.
Diffstat (limited to 'src')
-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 f131405bc7a..8fe42ec5604 100644
--- 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 cb6fc4a90ee..9d21bbe2a94 100644
--- 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