Changes from Vince Vielhaber to allow the optional clauses of CREATE

USER and ALTER USER to appear in any order, not only the fixed order
they used to be required to appear in.
Also, some changes from Tom Lane to create a FULL option for VACUUM;
it doesn't do anything yet, but I needed to change many of the same
files to make that happen, so now seemed like a good time.

1 files changed, 6 insertions, 13 deletions

diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 42b72e8074a..0e3bd2e4608 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.133 2001/06/23 00:07:34 momjian Exp $
+ * $Id: parsenodes.h,v 1.134 2001/07/10 22:09:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -339,23 +339,15 @@ typedef struct DropPLangStmt
 typedef struct CreateUserStmt
 {
 	NodeTag		type;
-	char	   *user;			/* PostgreSQL user login			  */
-	char	   *password;		/* PostgreSQL user password			  */
-	int			sysid;			/* PgSQL system id (-1 if don't care) */
-	bool		createdb;		/* Can the user create databases?	  */
-	bool		createuser;		/* Can this user create users?		  */
-	List	   *groupElts;		/* The groups the user is a member of */
-	char	   *validUntil;		/* The time the login is valid until  */
+	char	   *user;			/* PostgreSQL user login name */
+	List	   *options;		/* List of DefElem nodes */
 } CreateUserStmt;
 
 typedef struct AlterUserStmt
 {
 	NodeTag		type;
-	char	   *user;			/* PostgreSQL user login			  */
-	char	   *password;		/* PostgreSQL user password			  */
-	int			createdb;		/* Can the user create databases?	  */
-	int			createuser;		/* Can this user create users?		  */
-	char	   *validUntil;		/* The time the login is valid until  */
+	char	   *user;			/* PostgreSQL user login name */
+	List	   *options;		/* List of DefElem nodes */
 } AlterUserStmt;
 
 typedef struct DropUserStmt
@@ -715,6 +707,7 @@ typedef struct VacuumStmt
 {
 	NodeTag		type;
 	bool		vacuum;			/* do VACUUM step */
+	bool		full;			/* do FULL (non-concurrent) vacuum */
 	bool		analyze;		/* do ANALYZE step */
 	bool		verbose;		/* print progress info */
 	char	   *vacrel;			/* name of single table to process, or NULL */