From 6beb38cfc9ddd4cd3d2eb5402981ebdd69a618b4 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 23 Jul 2021 11:01:22 -0400 Subject: [PATCH] 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 --- src/test/regress/expected/triggers.out | 4 ++-- src/test/regress/sql/triggers.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out index 564eb4faa2..5d124cf96f 100644 --- a/src/test/regress/expected/triggers.out +++ b/src/test/regress/expected/triggers.out @@ -3425,7 +3425,7 @@ alter trigger a on grandparent rename to b; select tgrelid::regclass, tgname, (select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent')) -order by tgname, tgrelid::regclass::text; +order by tgname, tgrelid::regclass::text COLLATE "C"; tgrelid | tgname | parent_tgname -------------+--------+--------------- chi | b | b @@ -3452,7 +3452,7 @@ alter trigger p on grandparent rename to q; select tgrelid::regclass, tgname, (select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent')) -order by tgname, tgrelid::regclass::text; +order by tgname, tgrelid::regclass::text COLLATE "C"; tgrelid | tgname | parent_tgname -------------+--------+--------------- chi | b | b diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql index fb94eca3ed..9cb15c21dc 100644 --- a/src/test/regress/sql/triggers.sql +++ b/src/test/regress/sql/triggers.sql @@ -2589,7 +2589,7 @@ alter trigger a on grandparent rename to b; select tgrelid::regclass, tgname, (select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent')) -order by tgname, tgrelid::regclass::text; +order by tgname, tgrelid::regclass::text COLLATE "C"; alter trigger a on only grandparent rename to b; -- ONLY not supported alter trigger b on middle rename to c; -- can't rename trigger on partition create trigger c after insert on middle @@ -2603,7 +2603,7 @@ alter trigger p on grandparent rename to q; select tgrelid::regclass, tgname, (select tgname from pg_trigger tr where tr.oid = pg_trigger.tgparentid) parent_tgname from pg_trigger where tgrelid in (select relid from pg_partition_tree('grandparent')) -order by tgname, tgrelid::regclass::text; +order by tgname, tgrelid::regclass::text COLLATE "C"; drop table grandparent;