Commit36f729e

committed

Fix assertion failure in CREATE DATABASE

An assertion would fail when creating a database with libc localeprovider from a template database with icu locale provider.Reported-by: Marina Polyakova <m.polyakova@postgrespro.ru>Reviewed-by: Julien Rouhaud <rjuju123@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/f385ba25e7f8be427b8c582e5cca7d79%40postgrespro.ru#515a31c5429d6d37ad1d5c9d66962a1e

1 parente2fe0ae commit36f729eCopy full SHA for 36f729e

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1012,10 +1012,10 @@ createdb(ParseState pstate, const CreatedbStmt stmt)`
`1012`	`1012`	`dbcollate=src_collate;`
`1013`	`1013`	`if (dbctype==NULL)`
`1014`	`1014`	`dbctype=src_ctype;`
`1015`		`-if (dbiculocale==NULL)`
`1016`		`-dbiculocale=src_iculocale;`
`1017`	`1015`	`if (dblocprovider=='\0')`
`1018`	`1016`	`dblocprovider=src_locprovider;`
	`1017`	`+if (dbiculocale==NULL&&dblocprovider==COLLPROVIDER_ICU)`
	`1018`	`+dbiculocale=src_iculocale;`
`1019`	`1019`
`1020`	`1020`	`/* Some encodings are client only */`
`1021`	`1021`	`if (!PG_VALID_BE_ENCODING(encoding))`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,15 @@`
`49`	`49`	`'--icu-locale=@colNumeric=lower','foobarX'`
`50`	`50`	`],`
`51`	`51`	`'fails for invalid ICU locale');`
	`52`	`+`
	`53`	`+# additional node, which uses the icu provider`
	`54`	`+my$node2 = PostgreSQL::Test::Cluster->new('icu');`
	`55`	`+$node2->init(extra=> ['--locale-provider=icu','--icu-locale=en']);`
	`56`	`+$node2->start;`
	`57`	`+`
	`58`	`+$node2->command_ok(`
	`59`	`+['createdb','-T','template0','--locale-provider=libc','foobar55' ],`
	`60`	`+'create database with libc provider from template database with icu provider');`
`52`	`61`	`}`
`53`	`62`	`else`
`54`	`63`	`{`

Comments

(0)