Allow GROUPs to be dumped properly.

bmomjian · bmomjian · commit e7528612d870 · 1999-05-26T19:45:53.000Z
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.110 1999/05/26 16:06:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.111 1999/05/26 19:45:53 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -2626,7 +2626,6 @@ dumpACL(FILE *fout, TableInfo tbinfo)
 	/* Scan comma-separated ACL items */
 	for (tok = strtok(aclbuf, ","); tok != NULL; tok = strtok(NULL, ","))
 	{
-
 		/*
 		 * Token may start with '{' and/or '"'.  Actually only the start
 		 * of the string should have '{', but we don't verify that.
@@ -2668,7 +2667,10 @@ dumpACL(FILE *fout, TableInfo tbinfo)
 			else
 			{
 				*eqpos = '\0';	/* it's ok to clobber aclbuf */
-				fprintf(fout, "%s;\n", fmtId(tok, force_quotes));
+				if (strncmp(tok, "group ",strlen("group ")) == 0)
+					  fprintf(fout, "GROUP %s;\n",
+						fmtId(tok + sizeof("group ") - 1, force_quotes));
+				else	fprintf(fout, "%s;\n", fmtId(tok, force_quotes));
 			}
 		}
 		free(priv);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`* IDENTIFICATION`
`24`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.110 1999/05/26 16:06:45 momjian Exp $`
	`24`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.111 1999/05/26 19:45:53 momjian Exp $`
`25`	`25`	`*`
`26`	`26`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`27`	`27`	`*`
`@@ -2626,7 +2626,6 @@ dumpACL(FILE *fout, TableInfo tbinfo)`
`2626`	`2626`	`/* Scan comma-separated ACL items */`
`2627`	`2627`	`for (tok = strtok(aclbuf, ","); tok != NULL; tok = strtok(NULL, ","))`
`2628`	`2628`	`{`
`2629`		`-`
`2630`	`2629`	`/*`
`2631`	`2630`	`* Token may start with '{' and/or '"'. Actually only the start`
`2632`	`2631`	`* of the string should have '{', but we don't verify that.`
`@@ -2668,7 +2667,10 @@ dumpACL(FILE *fout, TableInfo tbinfo)`
`2668`	`2667`	`else`
`2669`	`2668`	`{`
`2670`	`2669`	`eqpos = '\0'; / it's ok to clobber aclbuf */`
`2671`		`- fprintf(fout, "%s;\n", fmtId(tok, force_quotes));`
	`2670`	`+ if (strncmp(tok, "group ",strlen("group ")) == 0)`
	`2671`	`+ fprintf(fout, "GROUP %s;\n",`
	`2672`	`+ fmtId(tok + sizeof("group ") - 1, force_quotes));`
	`2673`	`+ else fprintf(fout, "%s;\n", fmtId(tok, force_quotes));`
`2672`	`2674`	`}`
`2673`	`2675`	`}`
`2674`	`2676`	`free(priv);`