Replace references to COLLATE "en_US" with COLLATE "C".

Commit f0e44751d7175fa3394da2c8f85e3ceb3cdbfe63 is turning the
buildfarm red; let's try something hopefully more portable.

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 09cc193f2f886ae8237166540e4b6201f5bd2ed7..48d4e245dcbf7ea53d06e035c080ac0808cb4c29 100644 (file)
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -3034,7 +3034,7 @@ DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
        a int NOT NULL,
-       b char(2) COLLATE "en_US",
+       b char(2) COLLATE "C",
        CONSTRAINT check_a CHECK (a > 0)
 ) PARTITION BY LIST (a);
 CREATE TABLE fail_part (LIKE list_parted);
@@ -3117,7 +3117,7 @@ ERROR:  child table "fail_part" has different collation for column "b"
 DROP TABLE fail_part;
 -- check that the table being attached has all constraints of the parent
 CREATE TABLE fail_part (
-       b char(2) COLLATE "en_US",
+       b char(2) COLLATE "C",
        a int NOT NULL
 );
 ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1);
@@ -3130,7 +3130,7 @@ DROP TABLE fail_part;
 -- check the attributes and constraints after partition is attached
 CREATE TABLE part_1 (
        a int NOT NULL,
-       b char(2) COLLATE "en_US",
+       b char(2) COLLATE "C",
        CONSTRAINT check_a CHECK (a > 0)
 );
 ALTER TABLE list_parted ATTACH PARTITION part_1 FOR VALUES IN (1);

diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
index b40a18aec2bbeb6074234bd24868e4c5932b6239..783602314cd5c61f208494d5d6ff12b5ef8e51d0 100644 (file)
--- a/src/test/regress/expected/create_table.out
+++ b/src/test/regress/expected/create_table.out
@@ -391,7 +391,7 @@ CREATE TABLE partitioned (
        b int,
        c text,
        d text
-) PARTITION BY RANGE (a oid_ops, plusone(b), c collate "default", d collate "en_US");
+) PARTITION BY RANGE (a oid_ops, plusone(b), c collate "default", d collate "C");
 -- check relkind
 SELECT relkind FROM pg_class WHERE relname = 'partitioned';
  relkind 
@@ -429,7 +429,7 @@ ERROR:  cannot inherit from partitioned table "partitioned2"
  b      | integer |           |          | 
  c      | text    |           | not null | 
  d      | text    |           | not null | 
-Partition key: RANGE (a oid_ops, plusone(b), c, d COLLATE "en_US")
+Partition key: RANGE (a oid_ops, plusone(b), c, d COLLATE "C")
 
 \d partitioned2
             Table "public.partitioned2"

diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index c4ed69304fcd64660bd9d8fad541b6476d221e5f..39959ee07e6dddf29e22b3285c166e5c85da6c4a 100644 (file)
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -1923,7 +1923,7 @@ DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
        a int NOT NULL,
-       b char(2) COLLATE "en_US",
+       b char(2) COLLATE "C",
        CONSTRAINT check_a CHECK (a > 0)
 ) PARTITION BY LIST (a);
 CREATE TABLE fail_part (LIKE list_parted);
@@ -1999,7 +1999,7 @@ DROP TABLE fail_part;
 
 -- check that the table being attached has all constraints of the parent
 CREATE TABLE fail_part (
-       b char(2) COLLATE "en_US",
+       b char(2) COLLATE "C",
        a int NOT NULL
 );
 ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1);
@@ -2012,7 +2012,7 @@ DROP TABLE fail_part;
 -- check the attributes and constraints after partition is attached
 CREATE TABLE part_1 (
        a int NOT NULL,
-       b char(2) COLLATE "en_US",
+       b char(2) COLLATE "C",
        CONSTRAINT check_a CHECK (a > 0)
 );
 ALTER TABLE list_parted ATTACH PARTITION part_1 FOR VALUES IN (1);

diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
index 69848e3094865b1a95f457923aff945cdd891523..f1a67fddfa495141acecb919ca3dd9b4bb6b4d67 100644 (file)
--- a/src/test/regress/sql/create_table.sql
+++ b/src/test/regress/sql/create_table.sql
@@ -397,7 +397,7 @@ CREATE TABLE partitioned (
        b int,
        c text,
        d text
-) PARTITION BY RANGE (a oid_ops, plusone(b), c collate "default", d collate "en_US");
+) PARTITION BY RANGE (a oid_ops, plusone(b), c collate "default", d collate "C");
 
 -- check relkind
 SELECT relkind FROM pg_class WHERE relname = 'partitioned';