diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/commands/copy.h | 4 | ||||
| -rw-r--r-- | src/include/commands/user.h | 14 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 20 |
3 files changed, 23 insertions, 15 deletions
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index 1f2af72122b..4560cd3672c 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: copy.h,v 1.7 1999/12/14 00:08:19 momjian Exp $ + * $Id: copy.h,v 1.8 2000/01/14 22:11:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -15,6 +15,6 @@ void DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, - char *filename, char *delim, char *null_print, int fileumask); + char *filename, char *delim, char *null_print); #endif /* COPY_H */ diff --git a/src/include/commands/user.h b/src/include/commands/user.h index 036f1576820..6a52fe613d9 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -11,15 +11,15 @@ #define USER_H #include "nodes/parsenodes.h" -#include "tcop/dest.h" +#include "access/htup.h" -extern void DefineUser(CreateUserStmt *stmt, CommandDest); -extern void AlterUser(AlterUserStmt *stmt, CommandDest); -extern void RemoveUser(char *user, CommandDest); +extern void CreateUser(CreateUserStmt *stmt); +extern void AlterUser(AlterUserStmt *stmt); +extern void DropUser(DropUserStmt *stmt); -extern void CreateGroup(CreateGroupStmt *stmt, CommandDest dest); -extern void AlterGroup(AlterGroupStmt *stmt, CommandDest dest); -extern void DropGroup(DropGroupStmt *stmt, CommandDest dest); +extern void CreateGroup(CreateGroupStmt *stmt); +extern void AlterGroup(AlterGroupStmt *stmt, const char * tag); +extern void DropGroup(DropGroupStmt *stmt); extern HeapTuple update_pg_pwd(void); diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 714f06d5db0..0b2a2a0e93a 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.92 1999/12/16 17:24:19 momjian Exp $ + * $Id: parsenodes.h,v 1.93 2000/01/14 22:11:38 petere Exp $ * *------------------------------------------------------------------------- */ @@ -270,18 +270,26 @@ typedef struct CreateUserStmt 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? */ + 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 */ } CreateUserStmt; -typedef CreateUserStmt AlterUserStmt; +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 */ +} AlterUserStmt; typedef struct DropUserStmt { NodeTag type; - char *user; /* PostgreSQL user login */ + List *users; /* List of users to remove */ } DropUserStmt; @@ -301,7 +309,7 @@ typedef struct AlterGroupStmt { NodeTag type; char *name; /* name of group to alter */ - int action; /* +1 = add, -1 = drop, 0 = other (HACK!) */ + int action; /* +1 = add, -1 = drop user */ int sysid; /* sysid change */ List *listUsers; /* list of users to add/drop */ } AlterGroupStmt; |