Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6beb38c

Browse files
committed
Make new test immune to collation
Animals running in Czech locale failed. I could try to find table names that don't have this problem, but it seems simpler to just use the C locale. Per buildfarm
1 parent 80ba4bb commit 6beb38c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/test/regress/expected/triggers.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3425,7 +3425,7 @@ alter trigger a on grandparent rename to b;
34253425
select tgrelid::regclass, tgname,
34263426
(select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname
34273427
from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent'))
3428-
order by tgname, tgrelid::regclass::text;
3428+
order by tgname, tgrelid::regclass::text COLLATE "C";
34293429
tgrelid | tgname | parent_tgname
34303430
-------------+--------+---------------
34313431
chi | b | b
@@ -3452,7 +3452,7 @@ alter trigger p on grandparent rename to q;
34523452
select tgrelid::regclass, tgname,
34533453
(select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname
34543454
from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent'))
3455-
order by tgname, tgrelid::regclass::text;
3455+
order by tgname, tgrelid::regclass::text COLLATE "C";
34563456
tgrelid | tgname | parent_tgname
34573457
-------------+--------+---------------
34583458
chi | b | b

src/test/regress/sql/triggers.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2589,7 +2589,7 @@ alter trigger a on grandparent rename to b;
25892589
select tgrelid::regclass, tgname,
25902590
(select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname
25912591
from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent'))
2592-
order by tgname, tgrelid::regclass::text;
2592+
order by tgname, tgrelid::regclass::text COLLATE "C";
25932593
alter trigger a on only grandparent rename to b; -- ONLY not supported
25942594
alter trigger b on middle rename to c; -- can't rename trigger on partition
25952595
create trigger c after insert on middle
@@ -2603,7 +2603,7 @@ alter trigger p on grandparent rename to q;
26032603
select tgrelid::regclass, tgname,
26042604
(select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname
26052605
from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent'))
2606-
order by tgname, tgrelid::regclass::text;
2606+
order by tgname, tgrelid::regclass::text COLLATE "C";
26072607

26082608
drop table grandparent;
26092609

0 commit comments

Comments
 (0)