1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-09 22:41:56 +03:00

Message editing: remove gratuitous variations in message wording, standardize

terms, add some clarifications, fix some untranslatable attempts at dynamic
message building.
This commit is contained in:
Peter Eisentraut
2003-09-25 06:58:07 +00:00
parent 42013caf64
commit feb4f44d29
159 changed files with 1418 additions and 1408 deletions

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.107 2003/08/11 20:46:46 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.108 2003/09/25 06:57:59 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -211,7 +211,7 @@ set_inherited_rel_pathlist(Query *root, RelOptInfo *rel,
if (intMember(parentRTindex, root->rowMarks))
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("SELECT FOR UPDATE is not supported for inherit queries")));
errmsg("SELECT FOR UPDATE is not supported for inheritance queries")));
/*
* The executor will check the parent table's access permissions when

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.81 2003/08/04 02:40:00 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.82 2003/09/25 06:58:00 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -818,7 +818,7 @@ select_mergejoin_clauses(RelOptInfo *joinrel,
restrictinfo->mergejoinoperator == InvalidOid)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("FULL JOIN is only supported with mergejoinable join conditions")));
errmsg("FULL JOIN is only supported with merge-joinable join conditions")));
break;
default:
/* otherwise, it's OK to have nonmergeable join quals */

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.90 2003/08/04 02:40:01 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.91 2003/09/25 06:58:00 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -287,7 +287,7 @@ distribute_quals_to_rels(Query *root, Node *jtnode)
*/
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("UNION JOIN is not implemented yet")));
errmsg("UNION JOIN is not implemented")));
break;
default:
elog(ERROR, "unrecognized join type: %d",
@ -344,7 +344,7 @@ mark_baserels_for_outer_join(Query *root, Relids rels, Relids outerrels)
if (intMember(relno, root->rowMarks))
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("SELECT FOR UPDATE cannot be applied to the nullable side of an OUTER JOIN")));
errmsg("SELECT FOR UPDATE cannot be applied to the nullable side of an outer join")));
}
rel->outerjoinset = outerrels;
@ -773,7 +773,7 @@ process_implied_equality(Query *root,
pgopform->oprresult != BOOLOID)
ereport(ERROR,
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
errmsg("equality operator for types %s and %s should be mergejoinable, but isn't",
errmsg("equality operator for types %s and %s should be merge-joinable, but isn't",
format_type_be(ltype), format_type_be(rtype))));
clause = make_opclause(oprid(eq_operator), /* opno */

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.160 2003/08/17 19:58:05 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.161 2003/09/25 06:58:00 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -654,7 +654,7 @@ grouping_planner(Query *parse, double tuple_fraction)
if (PlannerQueryLevel > 1)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("SELECT FOR UPDATE is not allowed in subselects")));
errmsg("SELECT FOR UPDATE is not allowed in subqueries")));
foreach(l, parse->rowMarks)
{

View File

@ -16,7 +16,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.11 2003/08/08 21:41:52 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.12 2003/09/25 06:58:00 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -337,7 +337,7 @@ pull_up_subqueries(Query *parse, Node *jtnode, bool below_outer_join)
*/
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("UNION JOIN is not implemented yet")));
errmsg("UNION JOIN is not implemented")));
break;
default:
elog(ERROR, "unrecognized join type: %d",