mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert error message change for may/can/might --- needs discussion.

Browse Source
This commit is contained in:
Bruce Momjian 2007-01-31 21:03:37 +00:00
parent a134ee3379
commit 482e6936fa
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/sources.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.21 2007/01/31 20:56:19 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.22 2007/01/31 21:03:37 momjian Exp $ -->
<chapter id="source"> <chapter id="source">
<title>PostgreSQL Coding Conventions</title> <title>PostgreSQL Coding Conventions</title>
@ -95,7 +95,7 @@ ereport(ERROR,
func_signature_string(funcname, nargs, func_signature_string(funcname, nargs,
actual_arg_types)), actual_arg_types)),
errhint("Unable to choose a best candidate function. " errhint("Unable to choose a best candidate function. "
"You might need to add explicit typecasts."))); "You may need to add explicit typecasts.")));
</programlisting> </programlisting>
This illustrates the use of format codes to embed run-time values into This illustrates the use of format codes to embed run-time values into
a message text. Also, an optional <quote>hint</> message is provided. a message text. Also, an optional <quote>hint</> message is provided.

4
doc/src/sgml/typeconv.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.49 2007/01/31 20:56:19 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.50 2007/01/31 21:03:37 momjian Exp $ -->
<chapter Id="typeconv"> <chapter Id="typeconv">
<title>Type Conversion</title> <title>Type Conversion</title>
@ -447,7 +447,7 @@ try a similar case with <literal>~</>, we get:
SELECT ~ '20' AS "negation"; SELECT ~ '20' AS "negation";
ERROR: operator is not unique: ~ "unknown" ERROR: operator is not unique: ~ "unknown"
HINT: Could not choose a best candidate operator. You might need to add explicit HINT: Could not choose a best candidate operator. You may need to add explicit
type casts. type casts.
</screen> </screen>
This happens because the system can't decide which of the several This happens because the system can't decide which of the several

6
src/backend/parser/parse_func.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.192 2007/01/31 20:56:20 momjian Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.193 2007/01/31 21:03:37 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -213,7 +213,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
func_signature_string(funcname, nargs, func_signature_string(funcname, nargs,
actual_arg_types)), actual_arg_types)),
errhint("Could not choose a best candidate function. " errhint("Could not choose a best candidate function. "
"You might need to add explicit type casts."), "You may need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
else else
ereport(ERROR, ereport(ERROR,
@ -222,7 +222,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
func_signature_string(funcname, nargs, func_signature_string(funcname, nargs,
actual_arg_types)), actual_arg_types)),
errhint("No function matches the given name and argument types. " errhint("No function matches the given name and argument types. "
"You might need to add explicit type casts."), "You may need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
} }

6
src/backend/parser/parse_oper.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.92 2007/01/31 20:56:20 momjian Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.93 2007/01/31 21:03:37 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -771,7 +771,7 @@ op_error(ParseState *pstate, List *op, char oprkind,
errmsg("operator is not unique: %s", errmsg("operator is not unique: %s",
op_signature_string(op, oprkind, arg1, arg2)), op_signature_string(op, oprkind, arg1, arg2)),
errhint("Could not choose a best candidate operator. " errhint("Could not choose a best candidate operator. "
"You might need to add explicit type casts."), "You may need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
else else
ereport(ERROR, ereport(ERROR,
@ -779,7 +779,7 @@ op_error(ParseState *pstate, List *op, char oprkind,
errmsg("operator does not exist: %s", errmsg("operator does not exist: %s",
op_signature_string(op, oprkind, arg1, arg2)), op_signature_string(op, oprkind, arg1, arg2)),
errhint("No operator matches the given name and argument type(s). " errhint("No operator matches the given name and argument type(s). "
"You might need to add explicit type casts."), "You may need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
} }