external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes tests

pull/7240/head
gindibay 2023-10-27 09:07:19 +03:00
parent 473f6cbf05
commit a797584f1c
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/distributed/commands/database.c
View File

@ -545,17 +545,26 @@ FreeDatabaseCollationInfo(DatabaseCollationInfo collInfo)
} }
static char *
static char *get_locale_provider_string(char datlocprovider) get_locale_provider_string(char datlocprovider)
{ {
switch (datlocprovider) switch (datlocprovider)
{ {
case 'c': case 'c':
{
return "libc"; return "libc";
}
case 'i': case 'i':
{
return "icu"; return "icu";
}
case 'l': case 'l':
{
return "locale"; return "locale";
}
default: default:
return ""; return "";
} }
@ -605,7 +614,8 @@ GenerateCreateDatabaseStatementFromPgDatabase(Form_pg_database databaseForm)
if (databaseForm->datlocprovider != 0) if (databaseForm->datlocprovider != 0)
{ {
appendStringInfo(&str, " LOCALE_PROVIDER = '%s'", get_locale_provider_string(databaseForm->datlocprovider)); appendStringInfo(&str, " LOCALE_PROVIDER = '%s'", get_locale_provider_string(
databaseForm->datlocprovider));
} }
if (collInfo.collversion != NULL) if (collInfo.collversion != NULL)

6
src/test/regress/expected/create_drop_database_propagation.out
View File

@ -10,10 +10,10 @@ CREATE TABLESPACE create_drop_db_tablespace LOCATION :'create_drop_db_tablespace
create user create_drop_db_test_user; create user create_drop_db_test_user;
set citus.enable_create_database_propagation=on; set citus.enable_create_database_propagation=on;
CREATE DATABASE mydatabase CREATE DATABASE mydatabase
WITH TEMPLATE = 'template0' WITH OWNER = create_drop_db_test_user
OWNER = create_drop_db_test_user TEMPLATE = 'template0'
CONNECTION LIMIT = 10
ENCODING = 'UTF8' ENCODING = 'UTF8'
CONNECTION LIMIT = 10
LC_COLLATE = 'C' LC_COLLATE = 'C'
LC_CTYPE = 'C' LC_CTYPE = 'C'
TABLESPACE = create_drop_db_tablespace TABLESPACE = create_drop_db_tablespace