Back out pg_shadow changes to allow create table and locking permissions.

2 files changed, 22 insertions, 53 deletions

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 8506d005218..925d2ab77f6 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.171 2000/06/09 15:50:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.172 2000/06/12 03:40:30 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -145,8 +145,7 @@ static void doNegateFloat(Value *v);
 %type <ival>	opt_lock, lock_type
 %type <boolean>	opt_lmode, opt_force
 
-%type <ival>    user_createdb_clause, user_createuser_clause, user_createtable_clause,
-		user_locktable_clause
+%type <ival>    user_createdb_clause, user_createuser_clause
 %type <str>		user_passwd_clause
 %type <ival>            sysid_clause
 %type <str>		user_valid_clause
@@ -340,14 +339,14 @@ static void doNegateFloat(Value *v);
  */
 %token	ABORT_TRANS, ACCESS, AFTER, AGGREGATE, ANALYZE,
 		BACKWARD, BEFORE, BINARY, BIT,
-		CACHE, CLUSTER, COMMENT, COPY, CREATEDB, CREATETABLE, CREATEUSER, CYCLE,
+		CACHE, CLUSTER, COMMENT, COPY, CREATEDB, CREATEUSER, CYCLE,
 		DATABASE, DELIMITERS, DO,
 		EACH, ENCODING, EXCLUSIVE, EXPLAIN, EXTEND,
 		FORCE, FORWARD, FUNCTION, HANDLER,
 		INCREMENT, INDEX, INHERITS, INSTEAD, ISNULL,
-		LANCOMPILER, LIMIT, LISTEN, LOAD, LOCATION, LOCK_P, LOCKTABLE,
+		LANCOMPILER, LIMIT, LISTEN, LOAD, LOCATION, LOCK_P,
 		MAXVALUE, MINVALUE, MODE, MOVE,
-		NEW, NOCREATEDB, NOCREATETABLE, NOCREATEUSER, NOLOCKTABLE, NONE, NOTHING, NOTIFY, NOTNULL,
+		NEW, NOCREATEDB, NOCREATEUSER, NONE, NOTHING, NOTIFY, NOTNULL,
 		OFFSET, OIDS, OPERATOR, PASSWORD, PROCEDURAL,
 		REINDEX, RENAME, RESET, RETURNS, ROW, RULE,
 		SEQUENCE, SERIAL, SETOF, SHARE, SHOW, START, STATEMENT, STDIN, STDOUT, SYSID,
@@ -474,37 +473,32 @@ stmt :	AlterTableStmt
  *
  *****************************************************************************/
 
-CreateUserStmt:  CREATE USER UserId user_createdb_clause user_createuser_clause 
-                 user_createtable_clause user_locktable_clause user_group_clause
+CreateUserStmt:  CREATE USER UserId
+                 user_createdb_clause user_createuser_clause user_group_clause
                  user_valid_clause
 				{
 					CreateUserStmt *n = makeNode(CreateUserStmt);
 					n->user = $3;
-					n->sysid = -1;
+                    n->sysid = -1;
 					n->password = NULL;
 					n->createdb = $4 == +1 ? true : false;
 					n->createuser = $5 == +1 ? true : false;
-					n->createtable = $6 == +1 ? true : false;
-					n->locktable = $7 == +1 ? true : false;
-					n->groupElts = $8;
-					n->validUntil = $9;
+					n->groupElts = $6;
+					n->validUntil = $7;
 					$$ = (Node *)n;
 				}
                 | CREATE USER UserId WITH sysid_clause user_passwd_clause
-                user_createdb_clause user_createuser_clause 
-                user_createtable_clause user_locktable_clause user_group_clause
+                user_createdb_clause user_createuser_clause user_group_clause
                 user_valid_clause
                {
 					CreateUserStmt *n = makeNode(CreateUserStmt);
 					n->user = $3;
-   					n->sysid = $5;
+                    n->sysid = $5;
 					n->password = $6;
 					n->createdb = $7 == +1 ? true : false;
 					n->createuser = $8 == +1 ? true : false;
-					n->createtable = $9 == +1 ? true : false;
-					n->locktable = $10 == +1 ? true : false;					
-					n->groupElts = $11;
-					n->validUntil = $12;
+					n->groupElts = $9;
+					n->validUntil = $10;
 					$$ = (Node *)n;
                }                   
 		;
@@ -516,32 +510,27 @@ CreateUserStmt:  CREATE USER UserId user_createdb_clause user_createuser_clause
  *
  *****************************************************************************/
 
-AlterUserStmt:  ALTER USER UserId user_createdb_clause user_createuser_clause 
-		user_createtable_clause user_locktable_clause user_valid_clause
+AlterUserStmt:  ALTER USER UserId user_createdb_clause
+				user_createuser_clause user_valid_clause
 				{
 					AlterUserStmt *n = makeNode(AlterUserStmt);
 					n->user = $3;
 					n->password = NULL;
 					n->createdb = $4;
 					n->createuser = $5;
-					n->createtable = $6;
-					n->locktable = $7;
-					n->validUntil = $8;
+					n->validUntil = $6;
 					$$ = (Node *)n;
 				}
 			| ALTER USER UserId WITH PASSWORD Sconst
-			  user_createdb_clause user_createuser_clause 
-			  user_createtable_clause user_locktable_clause
-			  user_valid_clause
+			  user_createdb_clause
+			  user_createuser_clause user_valid_clause
 				{
 					AlterUserStmt *n = makeNode(AlterUserStmt);
 					n->user = $3;
 					n->password = $6;
 					n->createdb = $7;
 					n->createuser = $8;
-					n->createtable = $9;
-					n->locktable = $10;
-					n->validUntil = $11;
+					n->validUntil = $9;
 					$$ = (Node *)n;
 				}
 		;
@@ -584,22 +573,6 @@ user_createuser_clause:  CREATEUSER				{ $$ = +1; }
 			| /*EMPTY*/							{ $$ = 0; }
 		;
 
-user_createtable_clause:  CREATETABLE				{ $$ = +1; }
-			| NOCREATETABLE				{ $$ = -1; }
-			| /*EMPTY*/		{ 
-						/* EMPTY is default = CREATETABLE */
-							$$ = +1; 
-						}				
-		;
-
-user_locktable_clause:  LOCKTABLE				{ $$ = +1; }
-			| NOLOCKTABLE				{ $$ = -1; }
-			| /*EMPTY*/		{ 
-						/* EMPTY is default = LOCKTABLE */
-							$$ = +1; 
-						}
-		;
-
 user_list:  user_list ',' UserId
 				{
 					$$ = lcons((void*)makeString($3), $1);
diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index ae7bf39f62b..f167cb3c7e3 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -9,9 +9,9 @@
  *
  * IDENTIFICATION
 <<<<<<< keywords.c
- *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.75 2000/06/09 15:50:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.76 2000/06/12 03:40:30 momjian Exp $
 =======
- *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.75 2000/06/09 15:50:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.76 2000/06/12 03:40:30 momjian Exp $
 >>>>>>> 1.73
  *
  *-------------------------------------------------------------------------
@@ -75,7 +75,6 @@ static ScanKeyword ScanKeywords[] = {
 	{"copy", COPY},
 	{"create", CREATE},
 	{"createdb", CREATEDB},
-	{"createtable", CREATETABLE},
 	{"createuser", CREATEUSER},
 	{"cross", CROSS},
 	{"current_date", CURRENT_DATE},
@@ -156,7 +155,6 @@ static ScanKeyword ScanKeywords[] = {
 	{"local", LOCAL},
 	{"location", LOCATION},
 	{"lock", LOCK_P},
-	{"locktable", LOCKTABLE},
 	{"match", MATCH},
 	{"maxvalue", MAXVALUE},
 	{"minute", MINUTE_P},
@@ -172,9 +170,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"next", NEXT},
 	{"no", NO},
 	{"nocreatedb", NOCREATEDB},
-	{"nocreatetable", NOCREATETABLE},
 	{"nocreateuser", NOCREATEUSER},
-	{"nolocktable", NOLOCKTABLE},
 	{"none", NONE},
 	{"not", NOT},
 	{"nothing", NOTHING},