Commit2c321ce

committed

Fix collate.windows.win1252 test.

Do not rely on the OS recognizing a particular locale; find the rightlocale by querying the "en_US" collation.Author: Alexander LakhinReported-by: Alexander LakhinDiscussion:https://postgr.es/m/ae73f6f5-8221-c112-4640-5cda812a69de@gmail.com

1 parentc538592 commit2c321ceCopy full SHA for 2c321ce

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -992,7 +992,13 @@ drop type textrange_c;`
`992`	`992`	`drop type textrange_en_us;`
`993`	`993`	`-- nondeterministic collations`
`994`	`994`	`-- (not supported with libc provider)`
`995`		`-CREATE COLLATION ctest_det (locale = 'en_US', deterministic = true);`
	`995`	`+do $$`
	`996`	`+BEGIN`
	`997`	`+ EXECUTE 'CREATE COLLATION ctest_det (locale = ' \|\|`
	`998`	`+ quote_literal((SELECT collcollate FROM pg_collation WHERE`
	`999`	`+ collname = 'en_US')) \|\| ', deterministic = true);';`
	`1000`	`+ END`
	`1001`	`+$$;`
`996`	`1002`	`CREATE COLLATION ctest_nondet (locale = 'en_US', deterministic = false);`
`997`	`1003`	`ERROR: nondeterministic collations not supported with this provider`
`998`	`1004`	`-- cleanup`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -400,8 +400,13 @@ drop type textrange_en_us;`
`400`	`400`
`401`	`401`	`-- nondeterministic collations`
`402`	`402`	`-- (not supported with libc provider)`
`403`		`-`
`404`		`-CREATE COLLATION ctest_det (locale='en_US', deterministic= true);`
	`403`	`+do $$`
	`404`	`+BEGIN`
	`405`	`+ EXECUTE'CREATE COLLATION ctest_det (locale ='\|\|`
	`406`	`+ quote_literal((SELECT collcollateFROM pg_collationWHERE`
	`407`	`+ collname='en_US'))\|\|', deterministic = true);';`
	`408`	`+ END`
	`409`	`+$$;`
`405`	`410`	`CREATE COLLATION ctest_nondet (locale='en_US', deterministic= false);`
`406`	`411`
`407`	`412`

Comments

(0)