diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2023-06-19 11:51:22 -0700 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2023-06-19 11:51:22 -0700 |
| commit | 797f98036400bc70d4b331c5b1760a05aab59cfa (patch) | |
| tree | 54fbcab753104786a8ef0134fe8d65ed158d5b9b | |
| parent | 7fcd7ef2a9c372b789f95b40043edffdc611c566 (diff) | |
| download | postgresql-797f98036400bc70d4b331c5b1760a05aab59cfa.tar.gz postgresql-797f98036400bc70d4b331c5b1760a05aab59cfa.zip | |
pg_regress: for --no-locale, use LOCALE='C'.
Instead of specifying LC_COLLATE='C' and LC_CTYPE='C', specify
LOCALE='C' which will also affect ICU. This makes pg_regress
consistent with recent changes to initdb in commit a14e75eb0b6.
Fixes buildfarm failure.
Discussion: https://postgr.es/m/2458565.1686953169@sss.pgh.pa.us
| -rw-r--r-- | src/test/regress/pg_regress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index a546fc3d34d..60d34a40b20 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -1972,10 +1972,10 @@ create_database(const char *dbname) */ if (encoding) psql_add_command(buf, "CREATE DATABASE \"%s\" TEMPLATE=template0 ENCODING='%s'%s", dbname, encoding, - (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); + (nolocale) ? " LOCALE='C'" : ""); else psql_add_command(buf, "CREATE DATABASE \"%s\" TEMPLATE=template0%s", dbname, - (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); + (nolocale) ? " LOCALE='C'" : ""); psql_add_command(buf, "ALTER DATABASE \"%s\" SET lc_messages TO 'C';" "ALTER DATABASE \"%s\" SET lc_monetary TO 'C';" |