Commit 6d9481cd authored by Alvaro Herrera's avatar Alvaro Herrera

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.
parent 4a9bc2e0
...@@ -2659,7 +2659,7 @@ create trigger tg_stmt after insert on parent ...@@ -2659,7 +2659,7 @@ create trigger tg_stmt after insert on parent
for statement execute procedure trig_nothing(); for statement execute procedure trig_nothing();
select tgrelid::regclass, tgname, tgenabled from pg_trigger select tgrelid::regclass, tgname, tgenabled from pg_trigger
where tgrelid in ('parent'::regclass, 'child1'::regclass) where tgrelid in ('parent'::regclass, 'child1'::regclass)
order by tgrelid::regclass::text; order by tgrelid::regclass::text, tgname;
tgrelid | tgname | tgenabled tgrelid | tgname | tgenabled
---------+---------+----------- ---------+---------+-----------
child1 | tg | O child1 | tg | O
...@@ -2671,7 +2671,7 @@ alter table only parent enable always trigger tg; -- no recursion because ONLY ...@@ -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 alter table parent enable always trigger tg_stmt; -- no recursion because statement trigger
select tgrelid::regclass, tgname, tgenabled from pg_trigger select tgrelid::regclass, tgname, tgenabled from pg_trigger
where tgrelid in ('parent'::regclass, 'child1'::regclass) where tgrelid in ('parent'::regclass, 'child1'::regclass)
order by tgrelid::regclass::text; order by tgrelid::regclass::text, tgname;
tgrelid | tgname | tgenabled tgrelid | tgname | tgenabled
---------+---------+----------- ---------+---------+-----------
child1 | tg | O child1 | tg | O
...@@ -2684,7 +2684,7 @@ select tgrelid::regclass, tgname, tgenabled from pg_trigger ...@@ -2684,7 +2684,7 @@ select tgrelid::regclass, tgname, tgenabled from pg_trigger
alter table parent enable always trigger tg; alter table parent enable always trigger tg;
select tgrelid::regclass, tgname, tgenabled from pg_trigger select tgrelid::regclass, tgname, tgenabled from pg_trigger
where tgrelid in ('parent'::regclass, 'child1'::regclass) where tgrelid in ('parent'::regclass, 'child1'::regclass)
order by tgrelid::regclass::text; order by tgrelid::regclass::text, tgname;
tgrelid | tgname | tgenabled tgrelid | tgname | tgenabled
---------+---------+----------- ---------+---------+-----------
child1 | tg | A child1 | tg | A
......
...@@ -1836,18 +1836,18 @@ create trigger tg_stmt after insert on parent ...@@ -1836,18 +1836,18 @@ create trigger tg_stmt after insert on parent
for statement execute procedure trig_nothing(); for statement execute procedure trig_nothing();
select tgrelid::regclass, tgname, tgenabled from pg_trigger select tgrelid::regclass, tgname, tgenabled from pg_trigger
where tgrelid in ('parent'::regclass, 'child1'::regclass) 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 only parent enable always trigger tg; -- no recursion because ONLY
alter table parent enable always trigger tg_stmt; -- no recursion because statement trigger alter table parent enable always trigger tg_stmt; -- no recursion because statement trigger
select tgrelid::regclass, tgname, tgenabled from pg_trigger select tgrelid::regclass, tgname, tgenabled from pg_trigger
where tgrelid in ('parent'::regclass, 'child1'::regclass) 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 -- The following is a no-op for the parent trigger but not so
-- for the child trigger, so recursion should be applied. -- for the child trigger, so recursion should be applied.
alter table parent enable always trigger tg; alter table parent enable always trigger tg;
select tgrelid::regclass, tgname, tgenabled from pg_trigger select tgrelid::regclass, tgname, tgenabled from pg_trigger
where tgrelid in ('parent'::regclass, 'child1'::regclass) where tgrelid in ('parent'::regclass, 'child1'::regclass)
order by tgrelid::regclass::text; order by tgrelid::regclass::text, tgname;
drop table parent, child1; drop table parent, child1;
-- Verify that firing state propagates correctly on creation, too -- Verify that firing state propagates correctly on creation, too
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment