rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow pg_upgrade with PGCLIENTENCODING set 

This used to work, but since PGCLIENTENCODING is now a connection
option variable, pg_upgrade would prevent it.
This commit is contained in:
Peter Eisentraut 2011-04-07 19:22:34 +03:00
parent 1471a147f0
commit 1eb2231fc4
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/pg_upgrade/server.c
View File

@ -326,21 +326,26 @@ check_for_libpq_envvars(void)
/* Get valid libpq env vars from the PQconndefaults function */ /* Get valid libpq env vars from the PQconndefaults function */
start = option = PQconndefaults(); start = PQconndefaults();
while (option->keyword != NULL) for (option = start; option->keyword != NULL; option++)
{
if (option->envvar)
{ {
const char *value; const char *value;
if (option->envvar && (value = getenv(option->envvar)) && strlen(value) > 0) if (strcmp(option->envvar, "PGCLIENTENCODING") == 0)
continue;
value = getenv(option->envvar);
if (value && strlen(value) > 0)
{ {
found = true; found = true;
pg_log(PG_WARNING, pg_log(PG_WARNING,
"libpq env var %-20s is currently set to: %s\n", option->envvar, value); "libpq env var %-20s is currently set to: %s\n", option->envvar, value);
} }
}
option++;
} }
/* Free the memory that libpq allocated on our behalf */ /* Free the memory that libpq allocated on our behalf */