Commit1eb2231

committed

Allow pg_upgrade with PGCLIENTENCODING set

This used to work, but since PGCLIENTENCODING is now a connectionoption variable, pg_upgrade would prevent it.

1 parent1471a14 commit1eb2231Copy full SHA for 1eb2231

File tree

+15

-10

lines changed

+15

-10

lines changed

Lines changed: 15 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -326,21 +326,26 @@ check_for_libpq_envvars(void)`
`326`	`326`
`327`	`327`	`/* Get valid libpq env vars from the PQconndefaults function */`
`328`	`328`
`329`		`-start=option=PQconndefaults();`
	`329`	`+start=PQconndefaults();`
`330`	`330`
`331`		`-while (option->keyword!=NULL)`
	`331`	`+for (option=start;option->keyword!=NULL;option++)`
`332`	`332`	`{`
`333`		`-constchar*value;`
`334`		`-`
`335`		`-if (option->envvar&& (value=getenv(option->envvar))&&strlen(value)>0)`
	`333`	`+if (option->envvar)`
`336`	`334`	`{`
`337`		`-found= true;`
	`335`	`+constchar*value;`
`338`	`336`
`339`		`-pg_log(PG_WARNING,`
`340`		`-"libpq env var %-20s is currently set to: %s\n",option->envvar,value);`
`341`		`-}`
	`337`	`+if (strcmp(option->envvar,"PGCLIENTENCODING")==0)`
	`338`	`+continue;`
`342`	`339`
`343`		`-option++;`
	`340`	`+value=getenv(option->envvar);`
	`341`	`+if (value&&strlen(value)>0)`
	`342`	`+{`
	`343`	`+found= true;`
	`344`	`+`
	`345`	`+pg_log(PG_WARNING,`
	`346`	`+"libpq env var %-20s is currently set to: %s\n",option->envvar,value);`
	`347`	`+}`
	`348`	`+}`
`344`	`349`	`}`
`345`	`350`
`346`	`351`	`/* Free the memory that libpq allocated on our behalf */`

Comments

(0)