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

hlinnaka · hlinnaka · commit eb1c3b5e3b07 · 2010-03-03T20:10:48.000Z
privileges of foreign servers is "GRANT ... ON *FOREIGN* SERVER ...".
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.55 2010/02/26 02:01:16 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.56 2010/03/03 20:10:48 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -861,7 +861,7 @@ do { \
 		CONVERT_PRIV('C', "CREATE");
 	else if (strcmp(type, "FOREIGN DATA WRAPPER") == 0)
 		CONVERT_PRIV('U', "USAGE");
-	else if (strcmp(type, "SERVER") == 0)
+	else if (strcmp(type, "FOREIGN SERVER") == 0)
 		CONVERT_PRIV('U', "USAGE");
 	else if (strcmp(type, "LARGE OBJECT") == 0)
 	{
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.575 2010/02/26 02:01:16 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.576 2010/03/03 20:10:48 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -10176,7 +10176,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 	/* Handle the ACL */
 	namecopy = strdup(fmtId(srvinfo->dobj.name));
 	dumpACL(fout, srvinfo->dobj.catId, srvinfo->dobj.dumpId,
-			"SERVER",
+			"FOREIGN SERVER",
 			namecopy, NULL, srvinfo->dobj.name,
 			NULL, srvinfo->rolname,
 			srvinfo->srvacl);

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`	`else if (strcmp(type, "FOREIGN DATA WRAPPER") == 0)`
`863`	`863`	`CONVERT_PRIV('U', "USAGE");`
`864`		`- else if (strcmp(type, "SERVER") == 0)`
	`864`	`+ else if (strcmp(type, "FOREIGN SERVER") == 0)`
`865`	`865`	`CONVERT_PRIV('U', "USAGE");`
`866`	`866`	`else if (strcmp(type, "LARGE OBJECT") == 0)`
`867`	`867`	`{`