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

Commit 96e7e1b

Browse files
committed
Fix random regression failure in test case "collate.icu.utf8"
This is a fix similar to 2d7d67c, where slight plan alteration can cause a random failure of this regression test because of an incorect tuple ordering, except that this one involves lookups of pg_type. Similarly to the other case, add ORDER BY clauses to ensure the output order. The failure has been seen at least once on buildfarm member skink. Reported-by: Thomas Munro Discussion: https://postgr.es/m/CA+hUKGLjR9ZBvhXcr9b-NSBHPw9aRgbjyzGE+kqLsT4vwX+nkQ@mail.gmail.com Backpatch-through: 12
1 parent 68ef887 commit 96e7e1b

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/test/regress/expected/collate.icu.utf8.out

+4-2
Original file line numberDiff line numberDiff line change
@@ -1651,14 +1651,16 @@ SELECT relname FROM pg_class WHERE 'PG_CLASS'::text = relname COLLATE case_insen
16511651
pg_class
16521652
(1 row)
16531653

1654-
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND typname <> 'INT2'::text COLLATE case_insensitive;
1654+
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND typname <> 'INT2'::text
1655+
COLLATE case_insensitive ORDER BY typname;
16551656
typname
16561657
---------
16571658
int4
16581659
int8
16591660
(2 rows)
16601661

1661-
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND 'INT2'::text <> typname COLLATE case_insensitive;;
1662+
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND 'INT2'::text <> typname
1663+
COLLATE case_insensitive ORDER BY typname;
16621664
typname
16631665
---------
16641666
int4

src/test/regress/sql/collate.icu.utf8.sql

+4-2
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,10 @@ SELECT 'ὀδυσσεύς' = 'ὈΔΥΣΣΕΎΣ' COLLATE case_insensitive;
603603
SELECT relname FROM pg_class WHERE relname = 'PG_CLASS'::text COLLATE case_insensitive;
604604
SELECT relname FROM pg_class WHERE 'PG_CLASS'::text = relname COLLATE case_insensitive;
605605

606-
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND typname <> 'INT2'::text COLLATE case_insensitive;
607-
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND 'INT2'::text <> typname COLLATE case_insensitive;;
606+
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND typname <> 'INT2'::text
607+
COLLATE case_insensitive ORDER BY typname;
608+
SELECT typname FROM pg_type WHERE typname LIKE 'int_' AND 'INT2'::text <> typname
609+
COLLATE case_insensitive ORDER BY typname;
608610

609611
-- test case adapted from subselect.sql
610612
CREATE TEMP TABLE outer_text (f1 text COLLATE case_insensitive, f2 text);

0 commit comments

Comments
 (0)