mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

For COMMENT ON DATABASE where database name is unknown or not the current

Browse Source 
database, emit a WARNING and do nothing, rather than raising ERROR.
Per recent discussion in which we concluded this is the best way to deal
with database dumps that are reloaded into a database of a new name.
This commit is contained in:
Tom Lane 2003-07-17 20:13:57 +00:00
parent 8cf63ba920
commit 0c172909d5
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/backend/commands/comment.c
View File

@ -7,7 +7,7 @@
* Copyright (c) 1996-2001, PostgreSQL Global Development Group * Copyright (c) 1996-2001, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.64 2003/07/04 02:51:33 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/comment.c,v 1.65 2003/07/17 20:13:57 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -403,20 +403,38 @@ CommentDatabase(List *qualname, char *comment)
elog(ERROR, "CommentDatabase: database name may not be qualified"); elog(ERROR, "CommentDatabase: database name may not be qualified");
database = strVal(lfirst(qualname)); database = strVal(lfirst(qualname));
/*
* We cannot currently support cross-database comments (since other DBs
* cannot see pg_description of this database). So, we reject attempts
* to comment on a database other than the current one. Someday this
* might be improved, but it would take a redesigned infrastructure.
*
* When loading a dump, we may see a COMMENT ON DATABASE for the old name
* of the database. Erroring out would prevent pg_restore from completing
* (which is really pg_restore's fault, but for now we will work around
* the problem here). Consensus is that the best fix is to treat wrong
* database name as a WARNING not an ERROR.
*/
/* First get the database OID */ /* First get the database OID */
oid = get_database_oid(database); oid = get_database_oid(database);
if (!OidIsValid(oid)) if (!OidIsValid(oid))
elog(ERROR, "database \"%s\" does not exist", database); {
elog(WARNING, "database \"%s\" does not exist", database);
/* Allow if the user matches the database dba or is a superuser */ return;
}
if (!pg_database_ownercheck(oid, GetUserId()))
elog(ERROR, "you are not permitted to comment on database \"%s\"",
database);
/* Only allow comments on the current database */ /* Only allow comments on the current database */
if (oid != MyDatabaseId) if (oid != MyDatabaseId)
elog(ERROR, "Database comments may only be applied to the current database"); {
elog(WARNING, "database comments may only be applied to the current database");
return;
}
/* Allow if the user matches the database dba or is a superuser */
if (!pg_database_ownercheck(oid, GetUserId()))
elog(ERROR, "you are not permitted to comment on database \"%s\"",
database);
/* Create the comment with the pg_database oid */ /* Create the comment with the pg_database oid */
CreateComments(oid, RelOid_pg_database, 0, comment); CreateComments(oid, RelOid_pg_database, 0, comment);