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

Commitf402b99

Browse files
committed
Type names should not be quoted
Our actual convention, contrary to what I said in59a2111, is not toquote type names, as evidenced by unquoted use of format_type_be()result value in error messages. Remove quotes from recently tweakedmessages accordingly.Per note from Tom Lane
1 parenta067b50 commitf402b99

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

‎src/backend/commands/amcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ lookup_index_am_handler_func(List *handler_name, char amtype)
260260
if (get_func_rettype(handlerOid)!=INDEX_AM_HANDLEROID)
261261
ereport(ERROR,
262262
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
263-
errmsg("function %s must return type\"%s\"",
263+
errmsg("function %s must return type%s",
264264
NameListToString(handler_name),
265265
"index_am_handler")));
266266
break;

‎src/backend/commands/conversioncmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ CreateConversionCommand(CreateConversionStmt *stmt)
8585
if (get_func_rettype(funcoid)!=VOIDOID)
8686
ereport(ERROR,
8787
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
88-
errmsg("encoding conversion function %s must return type\"%s\"",
88+
errmsg("encoding conversion function %s must return type%s",
8989
NameListToString(func_name),"void")));
9090

9191
/* Check we have EXECUTE rights for the function */

‎src/backend/commands/event_trigger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ CreateEventTrigger(CreateEventTrigStmt *stmt)
237237
if (funcrettype!=EVTTRIGGEROID)
238238
ereport(ERROR,
239239
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
240-
errmsg("function %s must return type\"%s\"",
240+
errmsg("function %s must return type%s",
241241
NameListToString(stmt->funcname),"event_trigger")));
242242

243243
/* Insert catalog entries. */

‎src/backend/commands/foreigncmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ lookup_fdw_handler_func(DefElem *handler)
486486
if (get_func_rettype(handlerOid)!=FDW_HANDLEROID)
487487
ereport(ERROR,
488488
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
489-
errmsg("function %s must return type\"%s\"",
489+
errmsg("function %s must return type%s",
490490
NameListToString((List*)handler->arg),"fdw_handler")));
491491

492492
returnhandlerOid;

‎src/backend/commands/operatorcmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ ValidateRestrictionEstimator(List *restrictionName)
275275
if (get_func_rettype(restrictionOid)!=FLOAT8OID)
276276
ereport(ERROR,
277277
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
278-
errmsg("restriction estimator function %s must return type\"%s\"",
278+
errmsg("restriction estimator function %s must return type%s",
279279
NameListToString(restrictionName),"float8")));
280280

281281
/* Require EXECUTE rights for the estimator */
@@ -321,7 +321,7 @@ ValidateJoinEstimator(List *joinName)
321321
if (get_func_rettype(joinOid)!=FLOAT8OID)
322322
ereport(ERROR,
323323
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
324-
errmsg("join estimator function %s must return type\"%s\"",
324+
errmsg("join estimator function %s must return type%s",
325325
NameListToString(joinName),"float8")));
326326

327327
/* Require EXECUTE rights for the estimator */

‎src/backend/commands/proclang.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
114114
if (funcrettype!=LANGUAGE_HANDLEROID)
115115
ereport(ERROR,
116116
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
117-
errmsg("function %s must return type\"%s\"",
117+
errmsg("function %s must return type%s",
118118
NameListToString(funcname),"language_handler")));
119119
}
120120
else
@@ -285,7 +285,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
285285
else
286286
ereport(ERROR,
287287
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
288-
errmsg("function %s must return type\"%s\"",
288+
errmsg("function %s must return type%s",
289289
NameListToString(stmt->plhandler),"language_handler")));
290290
}
291291

‎src/backend/commands/trigger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
438438
else
439439
ereport(ERROR,
440440
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
441-
errmsg("function %s must return type\"%s\"",
441+
errmsg("function %s must return type%s",
442442
NameListToString(stmt->funcname),"trigger")));
443443
}
444444

‎src/backend/commands/typecmds.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,14 @@ DefineType(List *names, List *parameters)
450450
{
451451
/* backwards-compatibility hack */
452452
ereport(WARNING,
453-
(errmsg("changing return type of function %s from\"%s\" to\"%s\"",
453+
(errmsg("changing return type of function %s from%s to%s",
454454
NameListToString(inputName),"opaque",typeName)));
455455
SetFunctionReturnType(inputOid,typoid);
456456
}
457457
else
458458
ereport(ERROR,
459459
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
460-
errmsg("type input function %s must return type\"%s\"",
460+
errmsg("type input function %s must return type%s",
461461
NameListToString(inputName),typeName)));
462462
}
463463
resulttype=get_func_rettype(outputOid);
@@ -467,14 +467,14 @@ DefineType(List *names, List *parameters)
467467
{
468468
/* backwards-compatibility hack */
469469
ereport(WARNING,
470-
(errmsg("changing return type of function %s from\"%s\" to\"%s\"",
470+
(errmsg("changing return type of function %s from%s to%s",
471471
NameListToString(outputName),"opaque","cstring")));
472472
SetFunctionReturnType(outputOid,CSTRINGOID);
473473
}
474474
else
475475
ereport(ERROR,
476476
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
477-
errmsg("type output function %s must return type\"%s\"",
477+
errmsg("type output function %s must return type%s",
478478
NameListToString(outputName),"cstring")));
479479
}
480480
if (receiveOid)
@@ -483,7 +483,7 @@ DefineType(List *names, List *parameters)
483483
if (resulttype!=typoid)
484484
ereport(ERROR,
485485
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
486-
errmsg("type receive function %s must return type\"%s\"",
486+
errmsg("type receive function %s must return type%s",
487487
NameListToString(receiveName),typeName)));
488488
}
489489
if (sendOid)
@@ -492,7 +492,7 @@ DefineType(List *names, List *parameters)
492492
if (resulttype!=BYTEAOID)
493493
ereport(ERROR,
494494
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
495-
errmsg("type send function %s must return type\"%s\"",
495+
errmsg("type send function %s must return type%s",
496496
NameListToString(sendName),"bytea")));
497497
}
498498

@@ -1834,7 +1834,7 @@ findTypeTypmodinFunction(List *procname)
18341834
if (get_func_rettype(procOid)!=INT4OID)
18351835
ereport(ERROR,
18361836
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
1837-
errmsg("typmod_in function %s must return type\"%s\"",
1837+
errmsg("typmod_in function %s must return type%s",
18381838
NameListToString(procname),"integer")));
18391839

18401840
returnprocOid;
@@ -1861,7 +1861,7 @@ findTypeTypmodoutFunction(List *procname)
18611861
if (get_func_rettype(procOid)!=CSTRINGOID)
18621862
ereport(ERROR,
18631863
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
1864-
errmsg("typmod_out function %s must return type\"%s\"",
1864+
errmsg("typmod_out function %s must return type%s",
18651865
NameListToString(procname),"cstring")));
18661866

18671867
returnprocOid;
@@ -1888,7 +1888,7 @@ findTypeAnalyzeFunction(List *procname, Oid typeOid)
18881888
if (get_func_rettype(procOid)!=BOOLOID)
18891889
ereport(ERROR,
18901890
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
1891-
errmsg("type analyze function %s must return type\"%s\"",
1891+
errmsg("type analyze function %s must return type%s",
18921892
NameListToString(procname),"boolean")));
18931893

18941894
returnprocOid;
@@ -2007,7 +2007,7 @@ findRangeSubtypeDiffFunction(List *procname, Oid subtype)
20072007
if (get_func_rettype(procOid)!=FLOAT8OID)
20082008
ereport(ERROR,
20092009
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
2010-
errmsg("range subtype diff function %s must return type\"%s\"",
2010+
errmsg("range subtype diff function %s must return type%s",
20112011
func_signature_string(procname,2,NIL,argList),
20122012
"double precision")));
20132013

‎src/backend/parser/parse_clause.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ transformRangeTableSample(ParseState *pstate, RangeTableSample *rts)
758758
if (get_func_rettype(handlerOid)!=TSM_HANDLEROID)
759759
ereport(ERROR,
760760
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
761-
errmsg("function %s must return type\"%s\"",
761+
errmsg("function %s must return type%s",
762762
NameListToString(rts->method),"tsm_handler"),
763763
parser_errposition(pstate,rts->location)));
764764

‎src/test/regress/expected/event_trigger.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
create event trigger regress_event_trigger
33
on ddl_command_start
44
execute procedure pg_backend_pid();
5-
ERROR: function pg_backend_pid must return type"event_trigger"
5+
ERROR: function pg_backend_pid must return type event_trigger
66
-- OK
77
create function test_event_trigger() returns event_trigger as $$
88
BEGIN

0 commit comments

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