mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert temporary patch to debug Windows breakage.

Browse Source 
This reverts commit 0a248208a038d7847ef98996c6b70209d782415c.
This commit is contained in:
Robert Haas 2012-07-20 22:31:19 -04:00
parent 0635c0b524
commit ed0af33247
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pl/plpgsql/src/pl_comp.c
View File

@ -285,7 +285,6 @@ do_compile(FunctionCallInfo fcinfo,
int *in_arg_varnos = NULL; int *in_arg_varnos = NULL;
PLpgSQL_variable **out_arg_variables; PLpgSQL_variable **out_arg_variables;
MemoryContext func_cxt; MemoryContext func_cxt;
PLpgSQL_trigtype fn_is_trigger;
/* /*
* Setup the scanner input and error info. We assume that this function * Setup the scanner input and error info. We assume that this function
@ -353,12 +352,11 @@ do_compile(FunctionCallInfo fcinfo,
function->resolve_option = plpgsql_variable_conflict; function->resolve_option = plpgsql_variable_conflict;
if (is_dml_trigger) if (is_dml_trigger)
fn_is_trigger = PLPGSQL_DML_TRIGGER; function->fn_is_trigger = PLPGSQL_DML_TRIGGER;
else if (is_event_trigger) else if (is_event_trigger)
fn_is_trigger = PLPGSQL_EVENT_TRIGGER; function->fn_is_trigger = PLPGSQL_EVENT_TRIGGER;
else else
fn_is_trigger = PLPGSQL_NOT_TRIGGER; function->fn_is_trigger = PLPGSQL_NOT_TRIGGER;
function->fn_is_trigger = fn_is_trigger;
/* /*
* Initialize the compiler, particularly the namespace stack. The * Initialize the compiler, particularly the namespace stack. The
@ -376,7 +374,6 @@ do_compile(FunctionCallInfo fcinfo,
sizeof(PLpgSQL_datum *) * datums_alloc); sizeof(PLpgSQL_datum *) * datums_alloc);
datums_last = 0; datums_last = 0;
Assert(fn_is_trigger == function->fn_is_trigger);
switch (function->fn_is_trigger) switch (function->fn_is_trigger)
{ {
case PLPGSQL_NOT_TRIGGER: case PLPGSQL_NOT_TRIGGER:
@ -540,13 +537,9 @@ do_compile(FunctionCallInfo fcinfo,
rettypeid == RECORDOID) rettypeid == RECORDOID)
/* okay */ ; /* okay */ ;
else if (rettypeid == TRIGGEROID || rettypeid == EVTTRIGGEROID) else if (rettypeid == TRIGGEROID || rettypeid == EVTTRIGGEROID)
{
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("trigger functions can only be called as triggers"), errmsg("trigger functions can only be called as triggers")));
errhint("CALLED_AS_TRIGGER=%d CALLED_AS_EVENT_TRIGGER=%d",
CALLED_AS_TRIGGER(fcinfo), CALLED_AS_EVENT_TRIGGER(fcinfo))));
}
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),