Fix stop condition for dumping GRANT commands

danielgustafsson · za-arthur · danielgustafsson · commit 7b7fa8513033 · 2023-04-26T14:24:13.000+02:00
Commit ce6b672 changed dumping GRANT commands to ensure that grantors already have an ADMIN OPTION on the role for which it is granting permissions. Looping over the grants per role has a stop condition on dumping the grant statements, but accidentally missed updating the variable for the conditional check. Author: Andreas Scherbaum <ads@pgug.de> Co-authored-by: Artur Zakirov <zaartur@gmail.com> Discussion: https://postgr.es/m/de44299d-cd31-b41f-2c2a-161fa5e586a5@pgug.de
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -1052,6 +1052,7 @@ dumpRoleMembership(PGconn *conn)
 				PQfinish(conn);
 				exit_nicely(1);
 			}
+			prev_remaining = remaining;
 
 			/* Make one pass over the grants for this role. */
 			for (i = start; i < end; ++i)

Original file line number	Diff line number	Diff line change
`@@ -1052,6 +1052,7 @@ dumpRoleMembership(PGconn *conn)`
`1052`	`1052`	`PQfinish(conn);`
`1053`	`1053`	`exit_nicely(1);`
`1054`	`1054`	`}`
	`1055`	`+ prev_remaining = remaining;`
`1055`	`1056`
`1056`	`1057`	`/* Make one pass over the grants for this role. */`
`1057`	`1058`	`for (i = start; i < end; ++i)`