From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 29 Jul 2001 22:12:49 +0000 (+0000)
Subject: Arrange for GRANT/REVOKE on a view to be dumped at the right time,
X-Git-Tag: REL7_1_3~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6b1a407f4c544c438f0bf6067b70e864719bb46;p=thirdparty%2Fpostgresql.git

Arrange for GRANT/REVOKE on a view to be dumped at the right time,
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
index b42311b3e10..4f2595edd48 100644
--- 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);
 
 }