Message editing: remove gratuitous variations in message wording, standardize

terms, add some clarifications, fix some untranslatable attempts at dynamic
message building.

3 files changed, 13 insertions, 13 deletions

diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 8abdd1bcb58..dfe693134b5 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.87 2003/09/17 17:19:17 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.88 2003/09/25 06:58:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -271,7 +271,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 		if (!is_instead || query->commandType != CMD_SELECT)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("only instead-select rules are currently supported on select")));
+					 errmsg("rules on SELECT rule must have action INSTEAD SELECT")));
 
 		/*
 		 * ... there can be no rule qual, ...
@@ -279,7 +279,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 		if (event_qual != NULL)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("event qualifications are not implemented for rules on select")));
+					 errmsg("event qualifications are not implemented for rules on SELECT")));
 
 		/*
 		 * ... the targetlist of the SELECT action must exactly match the
@@ -299,7 +299,7 @@ DefineQueryRewrite(RuleStmt *stmt)
 			if (i > event_relation->rd_att->natts)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-						 errmsg("select rule's target list has too many entries")));
+						 errmsg("SELECT rule's target list has too many entries")));
 
 			attr = event_relation->rd_att->attrs[i - 1];
 			attname = NameStr(attr->attname);
@@ -320,12 +320,12 @@ DefineQueryRewrite(RuleStmt *stmt)
 			if (strcmp(resdom->resname, attname) != 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-						 errmsg("select rule's target entry %d has different column name from \"%s\"", i, attname)));
+						 errmsg("SELECT rule's target entry %d has different column name from \"%s\"", i, attname)));
 
 			if (attr->atttypid != resdom->restype)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-						 errmsg("select rule's target entry %d has different type from attribute \"%s\"", i, attname)));
+						 errmsg("SELECT rule's target entry %d has different type from column \"%s\"", i, attname)));
 
 			/*
 			 * Allow typmods to be different only if one of them is -1,
@@ -338,13 +338,13 @@ DefineQueryRewrite(RuleStmt *stmt)
 				attr->atttypmod != -1 && resdom->restypmod != -1)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-						 errmsg("select rule's target entry %d has different size from attribute \"%s\"", i, attname)));
+						 errmsg("SELECT rule's target entry %d has different size from column \"%s\"", i, attname)));
 		}
 
 		if (i != event_relation->rd_att->natts)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-			   errmsg("select rule's target list has too few entries")));
+			   errmsg("SELECT rule's target list has too few entries")));
 
 		/*
 		 * ... there must not be another ON SELECT rule already ...
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index d0ca89ee6ab..3cbfe3b8f7c 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.129 2003/08/11 23:04:49 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.130 2003/09/25 06:58:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -455,7 +455,7 @@ process_matched_tle(TargetEntry *src_tle,
 		((ArrayRef *) prior_tle->expr)->refrestype)
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("multiple assignments to same attribute \"%s\"",
+				 errmsg("multiple assignments to same column \"%s\"",
 						attrName)));
 
 	/*
@@ -469,7 +469,7 @@ process_matched_tle(TargetEntry *src_tle,
 	if (!equal(priorbottom, ((ArrayRef *) src_tle->expr)->refexpr))
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("multiple assignments to same attribute \"%s\"",
+				 errmsg("multiple assignments to same column \"%s\"",
 						attrName)));
 
 	/*
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index d9c7967f7cf..ea48d2f07a3 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.78 2003/08/11 20:46:46 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.79 2003/09/25 06:58:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -876,7 +876,7 @@ ResolveNew_mutator(Node *node, ResolveNew_context *context)
 			if (var->varattno == InvalidAttrNumber)
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot handle whole-tuple reference")));
+						 errmsg("cannot handle whole-row reference")));
 
 			tle = get_tle_by_resno(context->targetlist, var->varattno);