From 863aa55624d891be57b54f8d12e61cb4fa9b70ef Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 6 Mar 2019 11:06:01 -0800 Subject: [PATCH] Fix collation dependency in test introduced in 8586bf7ed8, take 2. Per buildfarm. This time I hopefully actually made sure to get all the cases... --- src/test/regress/expected/create_am.out | 4 ++-- src/test/regress/sql/create_am.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/regress/expected/create_am.out b/src/test/regress/expected/create_am.out index cf8b0ff91b..bf6addc8c5 100644 --- a/src/test/regress/expected/create_am.out +++ b/src/test/regress/expected/create_am.out @@ -232,7 +232,7 @@ SELECT (SELECT 'toast for ' || relname::regclass FROM pg_class pcm WHERE pcm.reltoastrelid = pc.oid) ELSE relname::regclass::text - END AS relname + END COLLATE "C" AS relname FROM pg_class AS pc LEFT JOIN pg_am AS pa ON (pa.oid = pc.relam) WHERE pc.relname LIKE 'tableam_%_heapx' @@ -244,8 +244,8 @@ ORDER BY 3, 1, 2; r | heap | tableam_parted_2_heapx p | | tableam_parted_heapx S | | tableam_seq_heapx - r | heap2 | tableam_tblas_heapx r | heap2 | tableam_tbl_heapx + r | heap2 | tableam_tblas_heapx m | heap2 | tableam_tblmv_heapx r | heap2 | tableam_tblselectinto_heapx v | | tableam_view_heapx diff --git a/src/test/regress/sql/create_am.sql b/src/test/regress/sql/create_am.sql index 9d7778fdfe..8529105445 100644 --- a/src/test/regress/sql/create_am.sql +++ b/src/test/regress/sql/create_am.sql @@ -169,7 +169,7 @@ SELECT (SELECT 'toast for ' || relname::regclass FROM pg_class pcm WHERE pcm.reltoastrelid = pc.oid) ELSE relname::regclass::text - END AS relname + END COLLATE "C" AS relname FROM pg_class AS pc LEFT JOIN pg_am AS pa ON (pa.oid = pc.relam) WHERE pc.relname LIKE 'tableam_%_heapx'