database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 03:21:24 +03:00
Code

Sync pltcl_build_tuple_result's error handling with pltcl_trigger_handler.

Browse Source 
Meant to do this in 26abb50c4, but forgot.
This commit is contained in:
Tom Lane 2016-11-06 19:22:12 -05:00
parent 26abb50c49
commit 7f1bcfb93d
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3057,11 +3057,29 @@ pltcl_build_tuple_result(Tcl_Interp *interp, Tcl_Obj **kvObjv, int kvObjc,
char *fieldName = utf_e2u(Tcl_GetString(kvObjv[i])); char *fieldName = utf_e2u(Tcl_GetString(kvObjv[i]));
int attn = SPI_fnumber(call_state->ret_tupdesc, fieldName); int attn = SPI_fnumber(call_state->ret_tupdesc, fieldName);
if (attn <= 0 || call_state->ret_tupdesc->attrs[attn - 1]->attisdropped) /*
* As in pltcl_trigger_handler, silently ignore ".tupno" if it's in
* the list but doesn't match any column name.
*/
if (attn == SPI_ERROR_NOATTRIBUTE)
{
if (strcmp(fieldName, ".tupno") == 0)
continue;
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_COLUMN), (errcode(ERRCODE_UNDEFINED_COLUMN),
errmsg("column name/value list contains nonexistent column name \"%s\"", errmsg("column name/value list contains nonexistent column name \"%s\"",
fieldName))); fieldName)));
}
if (attn <= 0)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot set system attribute \"%s\"",
fieldName)));
/* Ignore dropped attributes */
if (call_state->ret_tupdesc->attrs[attn - 1]->attisdropped)
continue;
values[attn - 1] = utf_e2u(Tcl_GetString(kvObjv[i + 1])); values[attn - 1] = utf_e2u(Tcl_GetString(kvObjv[i + 1]));
} }