Add comments explaining clauses used by CREATE ROLE but not ALTER.

bmomjian · bmomjian · commit 9f53cfd9dbe4 · 2005-09-23T22:25:25.000Z
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.510 2005/09/05 23:50:48 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.511 2005/09/23 22:25:25 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -623,10 +623,6 @@ OptRoleElem:
 					$$ = makeDefElem("unencryptedPassword",
 									 (Node *)makeString($3));
 				}
-			| SYSID Iconst
-				{
-					$$ = makeDefElem("sysid", (Node *)makeInteger($2));
-				}
 			| SUPERUSER_P
 				{
 					$$ = makeDefElem("superuser", (Node *)makeInteger(TRUE));
@@ -680,17 +676,19 @@ OptRoleElem:
 				{
 					$$ = makeDefElem("connectionlimit", (Node *)makeInteger($3));
 				}
-			| IN_P ROLE name_list
+			| VALID UNTIL Sconst
 				{
-					$$ = makeDefElem("addroleto", (Node *)$3);
+					$$ = makeDefElem("validUntil", (Node *)makeString($3));
 				}
-			| IN_P GROUP_P name_list
+		/*	Supported but not documented for roles, for use by ALTER GROUP. */
+			| USER name_list
 				{
-					$$ = makeDefElem("addroleto", (Node *)$3);
+					$$ = makeDefElem("rolemembers", (Node *)$2);
 				}
-			| VALID UNTIL Sconst
+		/* The following are not supported by ALTER ROLE/USER/GROUP */
+			| SYSID Iconst
 				{
-					$$ = makeDefElem("validUntil", (Node *)makeString($3));
+					$$ = makeDefElem("sysid", (Node *)makeInteger($2));
 				}
 			| ADMIN name_list
 				{
@@ -700,9 +698,13 @@ OptRoleElem:
 				{
 					$$ = makeDefElem("rolemembers", (Node *)$2);
 				}
-			| USER name_list
+			| IN_P ROLE name_list
 				{
-					$$ = makeDefElem("rolemembers", (Node *)$2);
+					$$ = makeDefElem("addroleto", (Node *)$3);
+				}
+			| IN_P GROUP_P name_list
+				{
+					$$ = makeDefElem("addroleto", (Node *)$3);
 				}
 		;
 

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.510 2005/09/05 23:50:48 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.511 2005/09/23 22:25:25 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -623,10 +623,6 @@ OptRoleElem:`
`623`	`623`	`$$ = makeDefElem("unencryptedPassword",`
`624`	`624`	`(Node *)makeString($3));`
`625`	`625`	`}`
`626`		`- \| SYSID Iconst`
`627`		`- {`
`628`		`- $$ = makeDefElem("sysid", (Node *)makeInteger($2));`
`629`		`- }`
`630`	`626`	`\| SUPERUSER_P`
`631`	`627`	`{`
`632`	`628`	`$$ = makeDefElem("superuser", (Node *)makeInteger(TRUE));`
`@@ -680,17 +676,19 @@ OptRoleElem:`
`680`	`676`	`{`
`681`	`677`	`$$ = makeDefElem("connectionlimit", (Node *)makeInteger($3));`
`682`	`678`	`}`
`683`		`- \| IN_P ROLE name_list`
	`679`	`+ \| VALID UNTIL Sconst`
`684`	`680`	`{`
`685`		`- $$ = makeDefElem("addroleto", (Node *)$3);`
	`681`	`+ $$ = makeDefElem("validUntil", (Node *)makeString($3));`
`686`	`682`	`}`
`687`		`- \| IN_P GROUP_P name_list`
	`683`	`+ /* Supported but not documented for roles, for use by ALTER GROUP. */`
	`684`	`+ \| USER name_list`
`688`	`685`	`{`
`689`		`- $$ = makeDefElem("addroleto", (Node *)$3);`
	`686`	`+ $$ = makeDefElem("rolemembers", (Node *)$2);`
`690`	`687`	`}`
`691`		`- \| VALID UNTIL Sconst`
	`688`	`+ /* The following are not supported by ALTER ROLE/USER/GROUP */`
	`689`	`+ \| SYSID Iconst`
`692`	`690`	`{`
`693`		`- $$ = makeDefElem("validUntil", (Node *)makeString($3));`
	`691`	`+ $$ = makeDefElem("sysid", (Node *)makeInteger($2));`
`694`	`692`	`}`
`695`	`693`	`\| ADMIN name_list`
`696`	`694`	`{`
`@@ -700,9 +698,13 @@ OptRoleElem:`
`700`	`698`	`{`
`701`	`699`	`$$ = makeDefElem("rolemembers", (Node *)$2);`
`702`	`700`	`}`
`703`		`- \| USER name_list`
	`701`	`+ \| IN_P ROLE name_list`
`704`	`702`	`{`
`705`		`- $$ = makeDefElem("rolemembers", (Node *)$2);`
	`703`	`+ $$ = makeDefElem("addroleto", (Node *)$3);`
	`704`	`+ }`
	`705`	`+ \| IN_P GROUP_P name_list`
	`706`	`+ {`
	`707`	`+ $$ = makeDefElem("addroleto", (Node *)$3);`
`706`	`708`	`}`
`707`	`709`	`;`
`708`	`710`