Commit71efd34

committed

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

Commitf0e4475 is turning thebuildfarm red; let's try something hopefully more portable.

1 parentf0e4475 commit71efd34Copy full SHA for 71efd34

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3034,7 +3034,7 @@ DROP TABLE unparted, fail_part;`
`3034`	`3034`	`-- check that partition bound is compatible`
`3035`	`3035`	`CREATE TABLE list_parted (`
`3036`	`3036`	`a int NOT NULL,`
`3037`		`-b char(2) COLLATE "en_US",`
	`3037`	`+b char(2) COLLATE "C",`
`3038`	`3038`	`CONSTRAINT check_a CHECK (a > 0)`
`3039`	`3039`	`) PARTITION BY LIST (a);`
`3040`	`3040`	`CREATE TABLE fail_part (LIKE list_parted);`
`@@ -3117,7 +3117,7 @@ ERROR: child table "fail_part" has different collation for column "b"`
`3117`	`3117`	`DROP TABLE fail_part;`
`3118`	`3118`	`-- check that the table being attached has all constraints of the parent`
`3119`	`3119`	`CREATE TABLE fail_part (`
`3120`		`-b char(2) COLLATE "en_US",`
	`3120`	`+b char(2) COLLATE "C",`
`3121`	`3121`	`a int NOT NULL`
`3122`	`3122`	`);`
`3123`	`3123`	`ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1);`
`@@ -3130,7 +3130,7 @@ DROP TABLE fail_part;`
`3130`	`3130`	`-- check the attributes and constraints after partition is attached`
`3131`	`3131`	`CREATE TABLE part_1 (`
`3132`	`3132`	`a int NOT NULL,`
`3133`		`-b char(2) COLLATE "en_US",`
	`3133`	`+b char(2) COLLATE "C",`
`3134`	`3134`	`CONSTRAINT check_a CHECK (a > 0)`
`3135`	`3135`	`);`
`3136`	`3136`	`ALTER TABLE list_parted ATTACH PARTITION part_1 FOR VALUES IN (1);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ CREATE TABLE partitioned (`
`391`	`391`	`b int,`
`392`	`392`	`c text,`
`393`	`393`	`d text`
`394`		`-) PARTITION BY RANGE (a oid_ops, plusone(b), c collate "default", d collate "en_US");`
	`394`	`+) PARTITION BY RANGE (a oid_ops, plusone(b), c collate "default", d collate "C");`
`395`	`395`	`-- check relkind`
`396`	`396`	`SELECT relkind FROM pg_class WHERE relname = 'partitioned';`
`397`	`397`	`relkind`
`@@ -429,7 +429,7 @@ ERROR: cannot inherit from partitioned table "partitioned2"`
`429`	`429`	`b \| integer \| \| \|`
`430`	`430`	`c \| text \| \| not null \|`
`431`	`431`	`d \| text \| \| not null \|`
`432`		`-Partition key: RANGE (a oid_ops, plusone(b), c, d COLLATE "en_US")`
	`432`	`+Partition key: RANGE (a oid_ops, plusone(b), c, d COLLATE "C")`
`433`	`433`
`434`	`434`	`\d partitioned2`
`435`	`435`	`Table "public.partitioned2"`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1923,7 +1923,7 @@ DROP TABLE unparted, fail_part;`
`1923`	`1923`	`-- check that partition bound is compatible`
`1924`	`1924`	`CREATETABLElist_parted (`
`1925`	`1925`	`aintNOT NULL,`
`1926`		`-bchar(2) COLLATE"en_US",`
	`1926`	`+bchar(2) COLLATE"C",`
`1927`	`1927`	`CONSTRAINT check_aCHECK (a>0)`
`1928`	`1928`	`) PARTITION BY LIST (a);`
`1929`	`1929`	`CREATETABLEfail_part (LIKE list_parted);`
`@@ -1999,7 +1999,7 @@ DROP TABLE fail_part;`
`1999`	`1999`
`2000`	`2000`	`-- check that the table being attached has all constraints of the parent`
`2001`	`2001`	`CREATETABLEfail_part (`
`2002`		`-bchar(2) COLLATE"en_US",`
	`2002`	`+bchar(2) COLLATE"C",`
`2003`	`2003`	`aintNOT NULL`
`2004`	`2004`	`);`
`2005`	`2005`	`ALTERTABLE list_parted ATTACH PARTITION fail_part FORVALUESIN (1);`
`@@ -2012,7 +2012,7 @@ DROP TABLE fail_part;`
`2012`	`2012`	`-- check the attributes and constraints after partition is attached`
`2013`	`2013`	`CREATETABLEpart_1 (`
`2014`	`2014`	`aintNOT NULL,`
`2015`		`-bchar(2) COLLATE"en_US",`
	`2015`	`+bchar(2) COLLATE"C",`
`2016`	`2016`	`CONSTRAINT check_aCHECK (a>0)`
`2017`	`2017`	`);`
`2018`	`2018`	`ALTERTABLE list_parted ATTACH PARTITION part_1 FORVALUESIN (1);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ CREATE TABLE partitioned (`
`397`	`397`	`bint,`
`398`	`398`	`ctext,`
`399`	`399`	`dtext`
`400`		`-) PARTITION BY RANGE (a oid_ops, plusone(b), c collate"default", d collate"en_US");`
	`400`	`+) PARTITION BY RANGE (a oid_ops, plusone(b), c collate"default", d collate"C");`
`401`	`401`
`402`	`402`	`-- check relkind`
`403`	`403`	`SELECT relkindFROM pg_classWHERE relname='partitioned';`

Comments

(0)