From 8b4ff8b6a14096a28910fbff3d485f30dcb9a637 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 1 Feb 2007 19:10:30 +0000 Subject: Wording cleanup for error messages. Also change can't -> cannot. Standard English uses "may", "can", and "might" in different ways: may - permission, "You may borrow my rake." can - ability, "I can lift that log." might - possibility, "It might rain today." Unfortunately, in conversational English, their use is often mixed, as in, "You may use this variable to do X", when in fact, "can" is a better choice. Similarly, "It may crash" is better stated, "It might crash". --- src/backend/parser/parse_clause.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/parser/parse_clause.c') diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 9792671fec6..0c718adc32a 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.163 2007/01/10 18:06:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.164 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -452,7 +452,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r) if (query->into != NULL) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("subquery in FROM may not have SELECT INTO"))); + errmsg("subquery in FROM cannot have SELECT INTO"))); /* * The subquery cannot make use of any variables from FROM items created @@ -472,7 +472,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r) if (contain_vars_of_level((Node *) query, 1)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("subquery in FROM may not refer to other relations of same query level"))); + errmsg("subquery in FROM cannot refer to other relations of same query level"))); } /* @@ -521,7 +521,7 @@ transformRangeFunction(ParseState *pstate, RangeFunction *r) if (contain_vars_of_level(funcexpr, 0)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("function expression in FROM may not refer to other relations of same query level"))); + errmsg("function expression in FROM cannot refer to other relations of same query level"))); } /* -- cgit v1.2.3