sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 00:01:57 -04:00
Code Issues Projects Releases Wiki Activity

Don't use "#" as an abbreviation for "number" in PL/Tcl error messages.

Browse Source 
Also, rewrite one error message to make it follow our message style
guidelines better.

Euler Taveira and Tom Lane
This commit is contained in:
Tom Lane 2015-09-16 12:08:57 -04:00
parent ad584a08c1
commit 4d0fc1d54b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pl/tcl/pltcl.c
View File

@ -1055,7 +1055,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, bool pltrusted)
if (ret_numvals % 2 != 0) if (ret_numvals % 2 != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED),
errmsg("invalid return list from trigger - must have even # of elements"))); errmsg("trigger's return list must have even number of elements")));
modattrs = (int *) palloc(tupdesc->natts * sizeof(int)); modattrs = (int *) palloc(tupdesc->natts * sizeof(int));
modvalues = (Datum *) palloc(tupdesc->natts * sizeof(Datum)); modvalues = (Datum *) palloc(tupdesc->natts * sizeof(Datum));
@ -2345,7 +2345,7 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
if (strlen(nulls) != qdesc->nargs) if (strlen(nulls) != qdesc->nargs)
{ {
Tcl_SetResult(interp, Tcl_SetResult(interp,
"length of nulls string doesn't match # of arguments", "length of nulls string doesn't match number of arguments",
TCL_STATIC); TCL_STATIC);
return TCL_ERROR; return TCL_ERROR;
} }
@ -2370,12 +2370,12 @@ pltcl_SPI_execute_plan(ClientData cdata, Tcl_Interp *interp,
return TCL_ERROR; return TCL_ERROR;
/************************************************************ /************************************************************
* Check that the # of arguments matches * Check that the number of arguments matches
************************************************************/ ************************************************************/
if (callnargs != qdesc->nargs) if (callnargs != qdesc->nargs)
{ {
Tcl_SetResult(interp, Tcl_SetResult(interp,
"argument list length doesn't match # of arguments for query", "argument list length doesn't match number of arguments for query",
TCL_STATIC); TCL_STATIC);
ckfree((char *) callargs); ckfree((char *) callargs);
return TCL_ERROR; return TCL_ERROR;