aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands/cluster.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2005-10-29 00:31:52 +0000
committerPeter Eisentraut <peter_e@gmx.net>2005-10-29 00:31:52 +0000
commit07bb9f086bd8ef7a60d6249d723423ec8847efbf (patch)
tree0f36fdf98f828e3fa82ea2ee956ee5d4a9c8fc58 /src/backend/commands/cluster.c
parenta7335a3401acf4f322c39087c961f62511545b70 (diff)
downloadpostgresql-07bb9f086bd8ef7a60d6249d723423ec8847efbf.tar.gz
postgresql-07bb9f086bd8ef7a60d6249d723423ec8847efbf.zip
Message corrections
Diffstat (limited to 'src/backend/commands/cluster.c')
-rw-r--r--src/backend/commands/cluster.c17
1 files changed, 8 insertions, 9 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))));
}