Skip to content
Snippets Groups Projects
Commit ed0af332 authored by Robert Haas's avatar Robert Haas
Browse files

Revert temporary patch to debug Windows breakage.

This reverts commit 0a248208.
parent 0635c0b5
No related branches found
No related tags found
No related merge requests found
...@@ -285,7 +285,6 @@ do_compile(FunctionCallInfo fcinfo, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment