From cd5d3af44e2a4f73c692d4653941c0516f967cb7 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Wed, 7 Dec 2016 13:47:34 -0500 Subject: [PATCH] Replace references to COLLATE "en_CA" with COLLATE "POSIX". Another attmempt to fix the tests which were added by commit f0e44751d7175fa3394da2c8f85e3ceb3cdbfe63. --- src/test/regress/expected/alter_table.out | 2 +- src/test/regress/sql/alter_table.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index 48d4e245dcb..99e20eb922b 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -3111,7 +3111,7 @@ CREATE TABLE fail_part ( ); ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1); ERROR: child table "fail_part" has different type for column "b" -ALTER TABLE fail_part ALTER b TYPE char (2) COLLATE "en_CA"; +ALTER TABLE fail_part ALTER b TYPE char (2) COLLATE "POSIX"; ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1); ERROR: child table "fail_part" has different collation for column "b" DROP TABLE fail_part; diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql index 39959ee07e6..b285a406d91 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -1993,7 +1993,7 @@ CREATE TABLE fail_part ( a int NOT NULL ); ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1); -ALTER TABLE fail_part ALTER b TYPE char (2) COLLATE "en_CA"; +ALTER TABLE fail_part ALTER b TYPE char (2) COLLATE "POSIX"; ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1); DROP TABLE fail_part;