Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit482e693

Browse files
committed
Revert error message change for may/can/might --- needs discussion.
1 parenta134ee3 commit482e693

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

‎doc/src/sgml/sources.sgml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.21 2007/01/3120:56:19 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.22 2007/01/3121:03:37 momjian Exp $ -->
22

33
<chapter id="source">
44
<title>PostgreSQL Coding Conventions</title>
@@ -95,7 +95,7 @@ ereport(ERROR,
9595
func_signature_string(funcname, nargs,
9696
actual_arg_types)),
9797
errhint("Unable to choose a best candidate function. "
98-
"Youmight need to add explicit typecasts.")));
98+
"Youmay need to add explicit typecasts.")));
9999
</programlisting>
100100
This illustrates the use of format codes to embed run-time values into
101101
a message text. Also, an optional <quote>hint</> message is provided.

‎doc/src/sgml/typeconv.sgml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.49 2007/01/3120:56:19 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.50 2007/01/3121:03:37 momjian Exp $ -->
22

33
<chapter Id="typeconv">
44
<title>Type Conversion</title>
@@ -447,7 +447,7 @@ try a similar case with <literal>~</>, we get:
447447
SELECT ~ '20' AS "negation";
448448

449449
ERROR: operator is not unique: ~ "unknown"
450-
HINT: Could not choose a best candidate operator. Youmight need to add explicit
450+
HINT: Could not choose a best candidate operator. Youmay need to add explicit
451451
type casts.
452452
</screen>
453453
This happens because the system can't decide which of the several

‎src/backend/parser/parse_func.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.192 2007/01/3120:56:20 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.193 2007/01/3121:03:37 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -213,7 +213,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
213213
func_signature_string(funcname,nargs,
214214
actual_arg_types)),
215215
errhint("Could not choose a best candidate function. "
216-
"Youmight need to add explicit type casts."),
216+
"Youmay need to add explicit type casts."),
217217
parser_errposition(pstate,location)));
218218
else
219219
ereport(ERROR,
@@ -222,7 +222,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
222222
func_signature_string(funcname,nargs,
223223
actual_arg_types)),
224224
errhint("No function matches the given name and argument types. "
225-
"Youmight need to add explicit type casts."),
225+
"Youmay need to add explicit type casts."),
226226
parser_errposition(pstate,location)));
227227
}
228228

‎src/backend/parser/parse_oper.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.92 2007/01/3120:56:20 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.93 2007/01/3121:03:37 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -771,15 +771,15 @@ op_error(ParseState *pstate, List *op, char oprkind,
771771
errmsg("operator is not unique: %s",
772772
op_signature_string(op,oprkind,arg1,arg2)),
773773
errhint("Could not choose a best candidate operator. "
774-
"Youmight need to add explicit type casts."),
774+
"Youmay need to add explicit type casts."),
775775
parser_errposition(pstate,location)));
776776
else
777777
ereport(ERROR,
778778
(errcode(ERRCODE_UNDEFINED_FUNCTION),
779779
errmsg("operator does not exist: %s",
780780
op_signature_string(op,oprkind,arg1,arg2)),
781781
errhint("No operator matches the given name and argument type(s). "
782-
"Youmight need to add explicit type casts."),
782+
"Youmay need to add explicit type casts."),
783783
parser_errposition(pstate,location)));
784784
}
785785

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp