Minor correction: cause ALTER ROLE role ROLE rolenames to behave

tglsfdc · tglsfdc · commit 0c2d7e39f908 · 2005-07-26T22:37:50.000Z
sensibly, even though we don't document it.
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.158 2005/07/26 16:38:26 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.159 2005/07/26 22:37:49 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -377,6 +377,10 @@ CreateRole(CreateRoleStmt *stmt)
 
 /*
  * ALTER ROLE
+ *
+ * Note: the rolemembers option accepted here is intended to support the
+ * backwards-compatible ALTER GROUP syntax.  Although it will work to say
+ * "ALTER ROLE role ROLE rolenames", we don't document it.
  */
 void
 AlterRole(AlterRoleStmt *stmt)
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.503 2005/07/26 16:38:27 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.504 2005/07/26 22:37:50 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -728,6 +728,7 @@ AlterRoleStmt:
 				 {
 					AlterRoleStmt *n = makeNode(AlterRoleStmt);
 					n->role = $3;
+					n->action = +1;	/* add, if there are members */
 					n->options = $5;
 					$$ = (Node *)n;
 				 }
@@ -764,6 +765,7 @@ AlterUserStmt:
 				 {
 					AlterRoleStmt *n = makeNode(AlterRoleStmt);
 					n->role = $3;
+					n->action = +1;	/* add, if there are members */
 					n->options = $5;
 					$$ = (Node *)n;
 				 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.503 2005/07/26 16:38:27 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.504 2005/07/26 22:37:50 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -728,6 +728,7 @@ AlterRoleStmt:`
`728`	`728`	`{`
`729`	`729`	`AlterRoleStmt *n = makeNode(AlterRoleStmt);`
`730`	`730`	`n->role = $3;`
	`731`	`+ n->action = +1; /* add, if there are members */`
`731`	`732`	`n->options = $5;`
`732`	`733`	`$$ = (Node *)n;`
`733`	`734`	`}`
`@@ -764,6 +765,7 @@ AlterUserStmt:`
`764`	`765`	`{`
`765`	`766`	`AlterRoleStmt *n = makeNode(AlterRoleStmt);`
`766`	`767`	`n->role = $3;`
	`768`	`+ n->action = +1; /* add, if there are members */`
`767`	`769`	`n->options = $5;`
`768`	`770`	`$$ = (Node *)n;`
`769`	`771`	`}`