open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve internationalization of messages involving type names

Browse Source 
Change the slightly different variations of the message
  function FOO must return type BAR
to a single wording, removing the variability in type name so that they
all create a single translation entry; since the type name is not to be
translated, there's no point in it being part of the message anyway.

Also, change them all to use the same quoting convention, namely that
the function name is not to be quoted but the type name is.  (I'm not
quite sure why this is so, but it's the clear majority.)

Some similar messages such as "encoding conversion function FOO must ..."
are also changed.
pull/11/head
Alvaro Herrera 9 years ago
parent 559e7a0a6d
commit 59a2111b23
8 changed files with 37 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/backend/commands/conversioncmds.c
  2. 4
      src/backend/commands/event_trigger.c
  3. 4
      src/backend/commands/foreigncmds.c
  4. 8
      src/backend/commands/operatorcmds.c
  5. 8
      src/backend/commands/proclang.c
  6. 4
      src/backend/commands/trigger.c
  7. 37
      src/backend/commands/typecmds.c
  8. 4
      src/backend/parser/parse_clause.c

4
src/backend/commands/conversioncmds.c
Unescape View File

@ -85,8 +85,8 @@ CreateConversionCommand(CreateConversionStmt *stmt)
if (get_func_rettype(funcoid) != VOIDOID) if (get_func_rettype(funcoid) != VOIDOID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("encoding conversion function %s must return type \"void\"", errmsg("encoding conversion function %s must return type \"%s\"",
NameListToString(func_name)))); NameListToString(func_name), "void")));
/* Check we have EXECUTE rights for the function */ /* Check we have EXECUTE rights for the function */
aclresult = pg_proc_aclcheck(funcoid, GetUserId(), ACL_EXECUTE); aclresult = pg_proc_aclcheck(funcoid, GetUserId(), ACL_EXECUTE);

4
src/backend/commands/event_trigger.c
Unescape View File

@ -237,8 +237,8 @@ CreateEventTrigger(CreateEventTrigStmt *stmt)
if (funcrettype != EVTTRIGGEROID) if (funcrettype != EVTTRIGGEROID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("function \"%s\" must return type \"event_trigger\"", errmsg("function %s must return type \"%s\"",
NameListToString(stmt->funcname)))); NameListToString(stmt->funcname), "event_trigger")));
/* Insert catalog entries. */ /* Insert catalog entries. */
return insert_event_trigger_tuple(stmt->trigname, stmt->eventname, return insert_event_trigger_tuple(stmt->trigname, stmt->eventname,

4
src/backend/commands/foreigncmds.c
Unescape View File

@ -486,8 +486,8 @@ lookup_fdw_handler_func(DefElem *handler)
if (get_func_rettype(handlerOid) != FDW_HANDLEROID) if (get_func_rettype(handlerOid) != FDW_HANDLEROID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("function %s must return type \"fdw_handler\"", errmsg("function %s must return type \"%s\"",
NameListToString((List *) handler->arg)))); NameListToString((List *) handler->arg), "fdw_handler")));
return handlerOid; return handlerOid;
} }

8
src/backend/commands/operatorcmds.c
Unescape View File

@ -275,8 +275,8 @@ ValidateRestrictionEstimator(List *restrictionName)
if (get_func_rettype(restrictionOid) != FLOAT8OID) if (get_func_rettype(restrictionOid) != FLOAT8OID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("restriction estimator function %s must return type \"float8\"", errmsg("restriction estimator function %s must return type \"%s\"",
NameListToString(restrictionName)))); NameListToString(restrictionName), "float8")));
/* Require EXECUTE rights for the estimator */ /* Require EXECUTE rights for the estimator */
aclresult = pg_proc_aclcheck(restrictionOid, GetUserId(), ACL_EXECUTE); aclresult = pg_proc_aclcheck(restrictionOid, GetUserId(), ACL_EXECUTE);
@ -321,8 +321,8 @@ ValidateJoinEstimator(List *joinName)
if (get_func_rettype(joinOid) != FLOAT8OID) if (get_func_rettype(joinOid) != FLOAT8OID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("join estimator function %s must return type \"float8\"", errmsg("join estimator function %s must return type \"%s\"",
NameListToString(joinName)))); NameListToString(joinName), "float8")));
/* Require EXECUTE rights for the estimator */ /* Require EXECUTE rights for the estimator */
aclresult = pg_proc_aclcheck(joinOid, GetUserId(), ACL_EXECUTE); aclresult = pg_proc_aclcheck(joinOid, GetUserId(), ACL_EXECUTE);

8
src/backend/commands/proclang.c
Unescape View File

@ -114,8 +114,8 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
if (funcrettype != LANGUAGE_HANDLEROID) if (funcrettype != LANGUAGE_HANDLEROID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("function %s must return type \"language_handler\"", errmsg("function %s must return type \"%s\"",
NameListToString(funcname)))); NameListToString(funcname), "language_handler")));
} }
else else
{ {
@ -285,8 +285,8 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("function %s must return type \"language_handler\"", errmsg("function %s must return type \"%s\"",
NameListToString(stmt->plhandler)))); NameListToString(stmt->plhandler), "language_handler")));
} }
/* validate the inline function */ /* validate the inline function */

4
src/backend/commands/trigger.c
Unescape View File

@ -438,8 +438,8 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("function %s must return type \"trigger\"", errmsg("function %s must return type \"%s\"",
NameListToString(stmt->funcname)))); NameListToString(stmt->funcname), "trigger")));
} }
/* /*

37
src/backend/commands/typecmds.c
Unescape View File

@ -450,14 +450,14 @@ DefineType(List *names, List *parameters)
{ {
/* backwards-compatibility hack */ /* backwards-compatibility hack */
ereport(WARNING, ereport(WARNING,
(errmsg("changing return type of function %s from \"opaque\" to %s", (errmsg("changing return type of function %s from \"%s\" to \"%s\"",
NameListToString(inputName), typeName))); NameListToString(inputName), "opaque", typeName)));
SetFunctionReturnType(inputOid, typoid); SetFunctionReturnType(inputOid, typoid);
} }
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("type input function %s must return type %s", errmsg("type input function %s must return type \"%s\"",
NameListToString(inputName), typeName))); NameListToString(inputName), typeName)));
} }
resulttype = get_func_rettype(outputOid); resulttype = get_func_rettype(outputOid);
@ -467,15 +467,15 @@ DefineType(List *names, List *parameters)
{ {
/* backwards-compatibility hack */ /* backwards-compatibility hack */
ereport(WARNING, ereport(WARNING,
(errmsg("changing return type of function %s from \"opaque\" to \"cstring\"", (errmsg("changing return type of function %s from \"%s\" to \"%s\"",
NameListToString(outputName)))); NameListToString(outputName), "opaque", "cstring")));
SetFunctionReturnType(outputOid, CSTRINGOID); SetFunctionReturnType(outputOid, CSTRINGOID);
} }
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("type output function %s must return type \"cstring\"", errmsg("type output function %s must return type \"%s\"",
NameListToString(outputName)))); NameListToString(outputName), "cstring")));
} }
if (receiveOid) if (receiveOid)
{ {
@ -483,7 +483,7 @@ DefineType(List *names, List *parameters)
if (resulttype != typoid) if (resulttype != typoid)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("type receive function %s must return type %s", errmsg("type receive function %s must return type \"%s\"",
NameListToString(receiveName), typeName))); NameListToString(receiveName), typeName)));
} }
if (sendOid) if (sendOid)
@ -492,8 +492,8 @@ DefineType(List *names, List *parameters)
if (resulttype != BYTEAOID) if (resulttype != BYTEAOID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("type send function %s must return type \"bytea\"", errmsg("type send function %s must return type \"%s\"",
NameListToString(sendName)))); NameListToString(sendName), "bytea")));
} }
/* /*
@ -1834,8 +1834,8 @@ findTypeTypmodinFunction(List *procname)
if (get_func_rettype(procOid) != INT4OID) if (get_func_rettype(procOid) != INT4OID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("typmod_in function %s must return type \"integer\"", errmsg("typmod_in function %s must return type \"%s\"",
NameListToString(procname)))); NameListToString(procname), "integer")));
return procOid; return procOid;
} }
@ -1861,8 +1861,8 @@ findTypeTypmodoutFunction(List *procname)
if (get_func_rettype(procOid) != CSTRINGOID) if (get_func_rettype(procOid) != CSTRINGOID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("typmod_out function %s must return type \"cstring\"", errmsg("typmod_out function %s must return type \"%s\"",
NameListToString(procname)))); NameListToString(procname), "cstring")));
return procOid; return procOid;
} }
@ -1888,8 +1888,8 @@ findTypeAnalyzeFunction(List *procname, Oid typeOid)
if (get_func_rettype(procOid) != BOOLOID) if (get_func_rettype(procOid) != BOOLOID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("type analyze function %s must return type \"boolean\"", errmsg("type analyze function %s must return type \"%s\"",
NameListToString(procname)))); NameListToString(procname), "boolean")));
return procOid; return procOid;
} }
@ -2007,8 +2007,9 @@ findRangeSubtypeDiffFunction(List *procname, Oid subtype)
if (get_func_rettype(procOid) != FLOAT8OID) if (get_func_rettype(procOid) != FLOAT8OID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("range subtype diff function %s must return type double precision", errmsg("range subtype diff function %s must return type \"%s\"",
func_signature_string(procname, 2, NIL, argList)))); func_signature_string(procname, 2, NIL, argList),
"double precision")));
if (func_volatile(procOid) != PROVOLATILE_IMMUTABLE) if (func_volatile(procOid) != PROVOLATILE_IMMUTABLE)
ereport(ERROR, ereport(ERROR,

4
src/backend/parser/parse_clause.c
Unescape View File

@ -758,8 +758,8 @@ transformRangeTableSample(ParseState *pstate, RangeTableSample *rts)
if (get_func_rettype(handlerOid) != TSM_HANDLEROID) if (get_func_rettype(handlerOid) != TSM_HANDLEROID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("function %s must return type \"tsm_handler\"", errmsg("function %s must return type \"%s\"",
NameListToString(rts->method)), NameListToString(rts->method), "tsm_handler"),
parser_errposition(pstate, rts->location))); parser_errposition(pstate, rts->location)));
/* OK, run the handler to get TsmRoutine, for argument type info */ /* OK, run the handler to get TsmRoutine, for argument type info */

Write Preview
Loading…
Cancel
Save