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

diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index d760dbe8f817a1303df7eda1c1a73217ed50cec8..90d858165faa8f8a785d36a5ad4cfe06f974b64c 100644 (file)
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -95,7 +95,7 @@ ereport(ERROR,
                 func_signature_string(funcname, nargs,
                                       actual_arg_types)),
          errhint("Unable to choose a best candidate function. "
-                 "You might need to add explicit typecasts.")));
+                 "You may need to add explicit typecasts.")));
 </programlisting>
     This illustrates the use of format codes to embed run-time values into
     a message text.  Also, an optional <quote>hint</> message is provided.

diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index c4cc63f2c8a3ceb239b0ea4f22bc05c4f463901d..a4997c058bc508cbddaaf799f8d4cc39f7e56458 100644 (file)
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -447,7 +447,7 @@ try a similar case with <literal>~</>, we get:
 SELECT ~ '20' AS "negation";
 
 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.
 </screen>
 This happens because the system can't decide which of the several

diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 065b0fffc87c41c6590712222f99cd178bbb0625..2aae6b5866d76c580afc67f5d5ed83f8b11b33a9 100644 (file)
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -213,7 +213,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
                                                        func_signature_string(funcname, nargs,
                                                                                                  actual_arg_types)),
                                         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)));
                else
                        ereport(ERROR,
@@ -222,7 +222,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
                                                        func_signature_string(funcname, nargs,
                                                                                                  actual_arg_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)));
        }
 

diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 5a2414d5947ad345e521fa128d643e7214a9e22f..ea18783b01e1dbba1d628e99d8372d7d819a78f6 100644 (file)
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -771,7 +771,7 @@ op_error(ParseState *pstate, List *op, char oprkind,
                                 errmsg("operator is not unique: %s",
                                                op_signature_string(op, oprkind, arg1, arg2)),
                                 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)));
        else
                ereport(ERROR,
@@ -779,7 +779,7 @@ op_error(ParseState *pstate, List *op, char oprkind,
                                 errmsg("operator does not exist: %s",
                                                op_signature_string(op, oprkind, arg1, arg2)),
                  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)));
 }