diff options
| author | Jan Wieck <JanWieck@Yahoo.com> | 2002-06-11 13:40:53 +0000 |
|---|---|---|
| committer | Jan Wieck <JanWieck@Yahoo.com> | 2002-06-11 13:40:53 +0000 |
| commit | 469cb65aca0307506886158be2fce9f4438f8361 (patch) | |
| tree | 2193a8dfc32a8b89bbd8babe01d7cdae8beb3e79 /src/backend/commands | |
| parent | 3b993acf19f83b2e8fa0517fdb7b08dfe1ad9dd1 (diff) | |
| download | postgresql-469cb65aca0307506886158be2fce9f4438f8361.tar.gz postgresql-469cb65aca0307506886158be2fce9f4438f8361.zip | |
Katherine Ward wrote:
> Changes to avoid collisions with WIN32 & MFC names...
> 1. Renamed:
> a. PROC => PGPROC
> b. GetUserName() => GetUserNameFromId()
> c. GetCurrentTime() => GetCurrentDateTime()
> d. IGNORE => IGNORE_DTF in include/utils/datetime.h & utils/adt/datetim
>
> 2. Added _P to some lex/yacc tokens:
> CONST, CHAR, DELETE, FLOAT, GROUP, IN, OUT
Jan
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/schemacmds.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/user.c | 4 | ||||
| -rw-r--r-- | src/backend/commands/variable.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index 8f1870473df..a790a28bccd 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.3 2002/05/17 20:53:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.4 2002/06/11 13:40:50 wieck Exp $ * *------------------------------------------------------------------------- */ @@ -50,7 +50,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt) if (!authId) { owner_userid = saved_userid; - owner_name = GetUserName(owner_userid); + owner_name = GetUserNameFromId(owner_userid); } else if (superuser()) { @@ -68,7 +68,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt) else /* not superuser */ { owner_userid = saved_userid; - owner_name = GetUserName(owner_userid); + owner_name = GetUserNameFromId(owner_userid); if (strcmp(authId, owner_name) != 0) elog(ERROR, "CREATE SCHEMA: permission denied" "\n\t\"%s\" is not a superuser, so cannot create a schema for \"%s\"", diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 98f47dd98bb..eb9a3e624cb 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.103 2002/05/21 22:05:54 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.104 2002/06/11 13:40:50 wieck Exp $ * *------------------------------------------------------------------------- */ @@ -724,7 +724,7 @@ AlterUser(AlterUserStmt *stmt) createuser < 0 && !validUntil && password && - strcmp(GetUserName(GetUserId()), stmt->user) == 0)) + strcmp(GetUserNameFromId(GetUserId()), stmt->user) == 0)) elog(ERROR, "ALTER USER: permission denied"); /* changes to the flat password file cannot be rolled back */ diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 03d7a664577..9ac829094dd 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.67 2002/05/17 01:19:17 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.68 2002/06/11 13:40:50 wieck Exp $ * *------------------------------------------------------------------------- */ @@ -583,5 +583,5 @@ assign_session_authorization(const char *value, bool doit, bool interactive) const char * show_session_authorization(void) { - return GetUserName(GetSessionUserId()); + return GetUserNameFromId(GetSessionUserId()); } |