From 966cdc29309965c3dc5a5608c38c36faeb9cbb77 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Wed, 18 Jan 2023 12:32:56 -0800 Subject: [PATCH v8 3/4] Add initdb option --no-import-collations. In preparation for the icu_multilib contrib module, which allows greater control over how ICU collations and how different ICU library versions are managed and used. By not creating the collations during initdb time, the user will be able to run pg_import_system_collations() themselves using a specific version of ICU. --- doc/src/sgml/ref/initdb.sgml | 11 +++++++++++ src/bin/initdb/initdb.c | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml index 5b2bdac101..5a2da829fb 100644 --- a/doc/src/sgml/ref/initdb.sgml +++ b/doc/src/sgml/ref/initdb.sgml @@ -305,6 +305,17 @@ PostgreSQL documentation + + + + + Prevents initdb from importing collations from the + system. This can be used to more carefully control which collations + are initially loaded in each database. + + + + diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 7a58c33ace..acaeb00086 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -135,6 +135,7 @@ static char *lc_time = NULL; static char *lc_messages = NULL; static char locale_provider = COLLPROVIDER_LIBC; static char *icu_locale = NULL; +static bool import_system_collations = true; static const char *default_text_search_config = NULL; static char *username = NULL; static bool pwprompt = false; @@ -1491,7 +1492,8 @@ setup_collation(FILE *cmdfd) BOOTSTRAP_SUPERUSERID, COLLPROVIDER_LIBC, PG_UTF8); /* Now import all collations we can find in the operating system */ - PG_CMD_PUTS("SELECT pg_import_system_collations('pg_catalog');\n\n"); + if (import_system_collations) + PG_CMD_PUTS("SELECT pg_import_system_collations('pg_catalog');\n\n"); } /* @@ -2116,6 +2118,8 @@ usage(const char *progname) printf(_(" --no-locale equivalent to --locale=C\n")); printf(_(" --locale-provider={libc|icu}\n" " set default locale provider for new databases\n")); + printf(_(" --no-import-collations\n" + " do not import collations from the system")); printf(_(" --pwfile=FILE read password for the new superuser from file\n")); printf(_(" -T, --text-search-config=CFG\n" " default text search configuration\n")); @@ -2767,6 +2771,7 @@ main(int argc, char *argv[]) {"discard-caches", no_argument, NULL, 14}, {"locale-provider", required_argument, NULL, 15}, {"icu-locale", required_argument, NULL, 16}, + {"no-import-collations", no_argument, NULL, 17}, {NULL, 0, NULL, 0} }; @@ -2924,6 +2929,9 @@ main(int argc, char *argv[]) case 16: icu_locale = pg_strdup(optarg); break; + case 17: + import_system_collations = false; + break; default: /* getopt_long already emitted a complaint */ pg_log_error_hint("Try \"%s --help\" for more information.", progname); -- 2.34.1