diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2005-10-29 00:31:52 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2005-10-29 00:31:52 +0000 |
| commit | 07bb9f086bd8ef7a60d6249d723423ec8847efbf (patch) | |
| tree | 0f36fdf98f828e3fa82ea2ee956ee5d4a9c8fc58 /src/backend/commands | |
| parent | a7335a3401acf4f322c39087c961f62511545b70 (diff) | |
Message corrections
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/cluster.c | 17 | ||||
| -rw-r--r-- | src/backend/commands/user.c | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 35420a87c0b..740250835db 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.140 2005/10/15 02:49:15 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.141 2005/10/29 00:31:51 petere Exp $ * *------------------------------------------------------------------------- */ @@ -356,13 +356,13 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck) if (!OldHeap->rd_att->attrs[colno - 1]->attnotnull) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot cluster on index \"%s\" because access method\n" - "does not handle null values", + errmsg("cannot cluster on index \"%s\" because access method does not handle null values", RelationGetRelationName(OldIndex)), - errhint("You may be able to work around this by marking column \"%s\" NOT NULL%s", - NameStr(OldHeap->rd_att->attrs[colno - 1]->attname), - recheck ? ",\nor use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster\n" - "specification from the table." : "."))); + recheck + ? errhint("You may be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.", + NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)) + : errhint("You may be able to work around this by marking column \"%s\" NOT NULL.", + NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)))); } else if (colno < 0) { @@ -372,8 +372,7 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck) /* index expression, lose... */ ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot cluster on expressional index \"%s\" because its index access\n" - "method does not handle null values", + errmsg("cannot cluster on expressional index \"%s\" because its index access method does not handle null values", RelationGetRelationName(OldIndex)))); } diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 3a2eb01af70..d26b3f8c8cb 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.162 2005/10/17 16:24:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.163 2005/10/29 00:31:51 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1194,7 +1194,7 @@ AddRoleMems(const char *rolename, Oid roleid, if (grantorId != GetUserId() && !superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("must be superuser to set grantor ID"))); + errmsg("must be superuser to set grantor"))); /* We need only regular writer's lock on pg_auth_members */ pg_authmem_rel = heap_open(AuthMemRelationId, RowExclusiveLock); |