Commiteb1c3b5

committed

Fix pg_dump of ACLs of foreign servers. The command to grant/revoke

privileges of foreign servers is "GRANT ... ON *FOREIGN* SERVER ...".

1 parent5e47403 commiteb1c3b5Copy full SHA for eb1c3b5

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`9`	`9`	`* Portions Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.55 2010/02/26 02:01:16 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.56 2010/03/03 20:10:48 heikki Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -861,7 +861,7 @@ do { \`
`861`	`861`	`CONVERT_PRIV('C',"CREATE");`
`862`	`862`	`elseif (strcmp(type,"FOREIGN DATA WRAPPER")==0)`
`863`	`863`	`CONVERT_PRIV('U',"USAGE");`
`864`		`-elseif (strcmp(type,"SERVER")==0)`
	`864`	`+elseif (strcmp(type,"FOREIGNSERVER")==0)`
`865`	`865`	`CONVERT_PRIV('U',"USAGE");`
`866`	`866`	`elseif (strcmp(type,"LARGE OBJECT")==0)`
`867`	`867`	`{`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*by PostgreSQL`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.575 2010/02/26 02:01:16 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.576 2010/03/03 20:10:48 heikki Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -10176,7 +10176,7 @@ dumpForeignServer(Archive fout, ForeignServerInfo srvinfo)`
`10176`	`10176`	`/* Handle the ACL */`
`10177`	`10177`	`namecopy=strdup(fmtId(srvinfo->dobj.name));`
`10178`	`10178`	`dumpACL(fout,srvinfo->dobj.catId,srvinfo->dobj.dumpId,`
`10179`		`-"SERVER",`
	`10179`	`+"FOREIGNSERVER",`
`10180`	`10180`	`namecopy,NULL,srvinfo->dobj.name,`
`10181`	`10181`	`NULL,srvinfo->rolname,`
`10182`	`10182`	`srvinfo->srvacl);`

Comments

(0)