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 e225deb138dc28aa11fb4daf7c3e75b6527f79b6..b8dcace3143455e79847bd8c589622156a5c4fd8 100644 (file)
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -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">
   <title>PostgreSQL Coding Conventions</title>
@@ -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 fe8163a74ea1d8c00cba39d0da2b806d6af8550a..3745b937f0c3ba3f7f3bcd74a0464f22cb23de93 100644 (file)
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -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">
 <title>Type Conversion</title>
@@ -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 531d9a7af603e9ecc95cd27f246f3686369ba4c0..bbe2bc857055f69720dff3dbfc712436176f0ab6 100644 (file)
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -8,7 +8,7 @@
  *
  *
  * 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,
                                                                                                  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 171941818701a47e7a4bd05221d44ca1748a4755..55c403672189f03efaad2ce461a0689a3a2529ab 100644 (file)
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -8,7 +8,7 @@
  *
  *
  * 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",
                                                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)));
 }