NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit84be671

committed

pg_dumpall: Add a -E flag to set the encoding, like pg_dump has.

Michael Paquier, reviewed by Fabien CoelhoDiscussion:http://postgr.es/m/CAB7nPqQcYWmrm2n-dVaMUhYPKFU_DxQwPuUGuC4ZF+8B=dS5xQ@mail.gmail.com

1 parent2f5ada2 commit84be671Copy full SHA for 84be671

File tree

2 files changed

+36

-1

lines changed

doc/src/sgml/ref
- pg_dumpall.sgml
src/bin/pg_dump
- pg_dumpall.c

2 files changed

+36

-1

lines changed

`‎doc/src/sgml/ref/pg_dumpall.sgml‎`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,19 @@ PostgreSQL documentation`
`99`	`99`	`</listitem>`
`100`	`100`	`</varlistentry>`
`101`	`101`
	`102`	`+ <varlistentry>`
	`103`	`+ <term><option>-E <replaceable class="parameter">encoding</replaceable></option></term>`
	`104`	`+ <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></option></term>`
	`105`	`+ <listitem>`
	`106`	`+ <para>`
	`107`	`+ Create the dump in the specified character set encoding. By default,`
	`108`	`+ the dump is created in the database encoding. (Another way to get the`
	`109`	`+ same result is to set the <envar>PGCLIENTENCODING</envar> environment`
	`110`	`+ variable to the desired dump encoding.)`
	`111`	`+ </para>`
	`112`	`+ </listitem>`
	`113`	`+ </varlistentry>`
	`114`	`+`
`102`	`115`	`<varlistentry>`
`103`	`116`	`<term><option>-f <replaceable class="parameter">filename</replaceable></option></term>`
`104`	`117`	`<term><option>--file=<replaceable class="parameter">filename</replaceable></option></term>`

`‎src/bin/pg_dump/pg_dumpall.c‎`

Lines changed: 23 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ main(int argc, char *argv[])`
`97`	`97`	`staticstructoptionlong_options[]= {`
`98`	`98`	`{"data-only",no_argument,NULL,'a'},`
`99`	`99`	`{"clean",no_argument,NULL,'c'},`
	`100`	`+{"encoding",required_argument,NULL,'E'},`
`100`	`101`	`{"file",required_argument,NULL,'f'},`
`101`	`102`	`{"globals-only",no_argument,NULL,'g'},`
`102`	`103`	`{"host",required_argument,NULL,'h'},`
`@@ -147,6 +148,7 @@ main(int argc, char *argv[])`
`147`	`148`	`char*pguser=NULL;`
`148`	`149`	`char*pgdb=NULL;`
`149`	`150`	`char*use_role=NULL;`
	`151`	`+constchar*dumpencoding=NULL;`
`150`	`152`	`trivalueprompt_password=TRI_DEFAULT;`
`151`	`153`	`booldata_only= false;`
`152`	`154`	`boolglobals_only= false;`
`@@ -204,7 +206,7 @@ main(int argc, char *argv[])`
`204`	`206`
`205`	`207`	`pgdumpopts=createPQExpBuffer();`
`206`	`208`
`207`		`-while ((c=getopt_long(argc,argv,"acd:f:gh:l:oOp:rsS:tU:vwWx",long_options,&optindex))!=-1)`
	`209`	`+while ((c=getopt_long(argc,argv,"acd:E:f:gh:l:oOp:rsS:tU:vwWx",long_options,&optindex))!=-1)`
`208`	`210`	`{`
`209`	`211`	`switch (c)`
`210`	`212`	`{`
`@@ -221,6 +223,12 @@ main(int argc, char *argv[])`
`221`	`223`	`connstr=pg_strdup(optarg);`
`222`	`224`	`break;`
`223`	`225`
	`226`	`+case'E':`
	`227`	`+dumpencoding=pg_strdup(optarg);`
	`228`	`+appendPQExpBufferStr(pgdumpopts," -E ");`
	`229`	`+appendShellString(pgdumpopts,optarg);`
	`230`	`+break;`
	`231`	`+`
`224`	`232`	`case'f':`
`225`	`233`	`filename=pg_strdup(optarg);`
`226`	`234`	`appendPQExpBufferStr(pgdumpopts," -f ");`
`@@ -453,6 +461,19 @@ main(int argc, char *argv[])`
`453`	`461`	`else`
`454`	`462`	`OPF=stdout;`
`455`	`463`
	`464`	`+/*`
	`465`	`+ * Set the client encoding if requested.`
	`466`	`+ */`
	`467`	`+if (dumpencoding)`
	`468`	`+{`
	`469`	`+if (PQsetClientEncoding(conn,dumpencoding)<0)`
	`470`	`+{`
	`471`	`+fprintf(stderr,_("%s: invalid client encoding \"%s\" specified\n"),`
	`472`	`+progname,dumpencoding);`
	`473`	`+exit_nicely(1);`
	`474`	`+}`
	`475`	`+}`
	`476`	`+`
`456`	`477`	`/*`
`457`	`478`	`* Get the active encoding and the standard_conforming_strings setting, so`
`458`	`479`	`* we know how to escape strings.`
`@@ -588,6 +609,7 @@ help(void)`
`588`	`609`	`printf(_("\nOptions controlling the output content:\n"));`
`589`	`610`	`printf(_(" -a, --data-only dump only the data, not the schema\n"));`
`590`	`611`	`printf(_(" -c, --clean clean (drop) databases before recreating\n"));`
	`612`	`+printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n"));`
`591`	`613`	`printf(_(" -g, --globals-only dump only global objects, no databases\n"));`
`592`	`614`	`printf(_(" -o, --oids include OIDs in dump\n"));`
`593`	`615`	`printf(_(" -O, --no-owner skip restoration of object ownership\n"));`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit84be671

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/pg_dumpall.sgml‎`

`‎src/bin/pg_dump/pg_dumpall.c‎`

0 commit comments