Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4ad4c1f

Browse files
committed
regress: fix test instability
Having additional triggers in a test table made the ORDER BY clauses inold queries underspecified. Add another column there for stability.Per sporadic buildfarm pink.
1 parent6e7b372 commit4ad4c1f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎src/test/regress/expected/triggers.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,7 +2536,7 @@ create trigger tg_stmt after insert on parent
25362536
for statement execute procedure trig_nothing();
25372537
select tgrelid::regclass, tgname, tgenabled from pg_trigger
25382538
where tgrelid in ('parent'::regclass, 'child1'::regclass)
2539-
order by tgrelid::regclass::text;
2539+
order by tgrelid::regclass::text, tgname;
25402540
tgrelid | tgname | tgenabled
25412541
---------+---------+-----------
25422542
child1 | tg | O
@@ -2548,7 +2548,7 @@ alter table only parent enable always trigger tg;-- no recursion because ONLY
25482548
alter table parent enable always trigger tg_stmt;-- no recursion because statement trigger
25492549
select tgrelid::regclass, tgname, tgenabled from pg_trigger
25502550
where tgrelid in ('parent'::regclass, 'child1'::regclass)
2551-
order by tgrelid::regclass::text;
2551+
order by tgrelid::regclass::text, tgname;
25522552
tgrelid | tgname | tgenabled
25532553
---------+---------+-----------
25542554
child1 | tg | O
@@ -2561,7 +2561,7 @@ select tgrelid::regclass, tgname, tgenabled from pg_trigger
25612561
alter table parent enable always trigger tg;
25622562
select tgrelid::regclass, tgname, tgenabled from pg_trigger
25632563
where tgrelid in ('parent'::regclass, 'child1'::regclass)
2564-
order by tgrelid::regclass::text;
2564+
order by tgrelid::regclass::text, tgname;
25652565
tgrelid | tgname | tgenabled
25662566
---------+---------+-----------
25672567
child1 | tg | A

‎src/test/regress/sql/triggers.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,18 +1754,18 @@ create trigger tg_stmt after insert on parent
17541754
for statement execute procedure trig_nothing();
17551755
select tgrelid::regclass, tgname, tgenabledfrom pg_trigger
17561756
where tgrelidin ('parent'::regclass,'child1'::regclass)
1757-
order by tgrelid::regclass::text;
1757+
order by tgrelid::regclass::text, tgname;
17581758
altertable only parent enable always trigger tg;-- no recursion because ONLY
17591759
altertable parent enable always trigger tg_stmt;-- no recursion because statement trigger
17601760
select tgrelid::regclass, tgname, tgenabledfrom pg_trigger
17611761
where tgrelidin ('parent'::regclass,'child1'::regclass)
1762-
order by tgrelid::regclass::text;
1762+
order by tgrelid::regclass::text, tgname;
17631763
-- The following is a no-op for the parent trigger but not so
17641764
-- for the child trigger, so recursion should be applied.
17651765
altertable parent enable always trigger tg;
17661766
select tgrelid::regclass, tgname, tgenabledfrom pg_trigger
17671767
where tgrelidin ('parent'::regclass,'child1'::regclass)
1768-
order by tgrelid::regclass::text;
1768+
order by tgrelid::regclass::text, tgname;
17691769
droptable parent, child1;
17701770

17711771
-- Verify that firing state propagates correctly on creation, too

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp