Arrange for GRANT/REVOKE on a view to be dumped at the right time,

tglsfdc · tglsfdc · commit d6b1a407f4c5 · 2001-07-29T22:12:49.000Z
namely after the view definition rather than before it.  Bug introduced
in 7.1 by changes to dump stuff in OID ordering.
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.2 2001/05/12 23:36:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.3 2001/07/29 22:12:49 tgl Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -3828,6 +3828,7 @@ dumpACL(Archive *fout, TableInfo tbinfo)
 			   *tok,
 			   *eqpos,
 			   *priv;
+	char	   *objoid;
 	char	   *sql;
 	char		tmp[1024];
 	int			sSize = 4096;
@@ -3908,7 +3909,12 @@ dumpACL(Archive *fout, TableInfo tbinfo)
 
 	free(aclbuf);
 
-	ArchiveEntry(fout, tbinfo.oid, tbinfo.relname, "ACL", NULL, sql, "", "", "", NULL, NULL);
+	if (tbinfo.viewdef != NULL)
+		objoid = tbinfo.viewoid;
+	else
+		objoid = tbinfo.oid;
+
+	ArchiveEntry(fout, objoid, tbinfo.relname, "ACL", NULL, sql, "", "", "", NULL, NULL);
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.2 2001/05/12 23:36:44 tgl Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.3 2001/07/29 22:12:49 tgl Exp $`
`26`	`26`	`*`
`27`	`27`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`28`	`28`	`*`
`@@ -3828,6 +3828,7 @@ dumpACL(Archive *fout, TableInfo tbinfo)`
`3828`	`3828`	`*tok,`
`3829`	`3829`	`*eqpos,`
`3830`	`3830`	`*priv;`
	`3831`	`+ char *objoid;`
`3831`	`3832`	`char *sql;`
`3832`	`3833`	`char tmp[1024];`
`3833`	`3834`	`int sSize = 4096;`
`@@ -3908,7 +3909,12 @@ dumpACL(Archive *fout, TableInfo tbinfo)`
`3908`	`3909`
`3909`	`3910`	`free(aclbuf);`
`3910`	`3911`
`3911`		`- ArchiveEntry(fout, tbinfo.oid, tbinfo.relname, "ACL", NULL, sql, "", "", "", NULL, NULL);`
	`3912`	`+ if (tbinfo.viewdef != NULL)`
	`3913`	`+ objoid = tbinfo.viewoid;`
	`3914`	`+ else`
	`3915`	`+ objoid = tbinfo.oid;`
	`3916`	`+`
	`3917`	`+ ArchiveEntry(fout, objoid, tbinfo.relname, "ACL", NULL, sql, "", "", "", NULL, NULL);`
`3912`	`3918`
`3913`	`3919`	`}`
`3914`	`3920`