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

tglsfdc · tglsfdc · commit 8d464d05d72c · 2001-07-29T22:12:23.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.215 2001/07/17 00:30:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.216 2001/07/29 22:12:23 tgl Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -3808,6 +3808,7 @@ dumpACL(Archive *fout, TableInfo tbinfo)
 			   *tok,
 			   *eqpos,
 			   *priv;
+	char	   *objoid;
 	char	   *sql;
 	char		tmp[1024];
 	int			sSize = 4096;
@@ -3888,7 +3889,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.215 2001/07/17 00:30:35 tgl Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.216 2001/07/29 22:12:23 tgl Exp $`
`26`	`26`	`*`
`27`	`27`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`28`	`28`	`*`
`@@ -3808,6 +3808,7 @@ dumpACL(Archive *fout, TableInfo tbinfo)`
`3808`	`3808`	`*tok,`
`3809`	`3809`	`*eqpos,`
`3810`	`3810`	`*priv;`
	`3811`	`+ char *objoid;`
`3811`	`3812`	`char *sql;`
`3812`	`3813`	`char tmp[1024];`
`3813`	`3814`	`int sSize = 4096;`
`@@ -3888,7 +3889,12 @@ dumpACL(Archive *fout, TableInfo tbinfo)`
`3888`	`3889`
`3889`	`3890`	`free(aclbuf);`
`3890`	`3891`
`3891`		`- ArchiveEntry(fout, tbinfo.oid, tbinfo.relname, "ACL", NULL, sql, "", "", "", NULL, NULL);`
	`3892`	`+ if (tbinfo.viewdef != NULL)`
	`3893`	`+ objoid = tbinfo.viewoid;`
	`3894`	`+ else`
	`3895`	`+ objoid = tbinfo.oid;`
	`3896`	`+`
	`3897`	`+ ArchiveEntry(fout, objoid, tbinfo.relname, "ACL", NULL, sql, "", "", "", NULL, NULL);`
`3892`	`3898`
`3893`	`3899`	`}`
`3894`	`3900`