Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commited0af33

Browse files
committed
Revert temporary patch to debug Windows breakage.
This reverts commit0a24820.
1 parent0635c0b commited0af33

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

‎src/pl/plpgsql/src/pl_comp.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ do_compile(FunctionCallInfo fcinfo,
285285
int*in_arg_varnos=NULL;
286286
PLpgSQL_variable**out_arg_variables;
287287
MemoryContextfunc_cxt;
288-
PLpgSQL_trigtypefn_is_trigger;
289288

290289
/*
291290
* Setup the scanner input and error info.We assume that this function
@@ -353,12 +352,11 @@ do_compile(FunctionCallInfo fcinfo,
353352
function->resolve_option=plpgsql_variable_conflict;
354353

355354
if (is_dml_trigger)
356-
fn_is_trigger=PLPGSQL_DML_TRIGGER;
355+
function->fn_is_trigger=PLPGSQL_DML_TRIGGER;
357356
elseif (is_event_trigger)
358-
fn_is_trigger=PLPGSQL_EVENT_TRIGGER;
357+
function->fn_is_trigger=PLPGSQL_EVENT_TRIGGER;
359358
else
360-
fn_is_trigger=PLPGSQL_NOT_TRIGGER;
361-
function->fn_is_trigger=fn_is_trigger;
359+
function->fn_is_trigger=PLPGSQL_NOT_TRIGGER;
362360

363361
/*
364362
* Initialize the compiler, particularly the namespace stack. The
@@ -376,7 +374,6 @@ do_compile(FunctionCallInfo fcinfo,
376374
sizeof(PLpgSQL_datum*)*datums_alloc);
377375
datums_last=0;
378376

379-
Assert(fn_is_trigger==function->fn_is_trigger);
380377
switch (function->fn_is_trigger)
381378
{
382379
casePLPGSQL_NOT_TRIGGER:
@@ -540,13 +537,9 @@ do_compile(FunctionCallInfo fcinfo,
540537
rettypeid==RECORDOID)
541538
/* okay */ ;
542539
elseif (rettypeid==TRIGGEROID||rettypeid==EVTTRIGGEROID)
543-
{
544540
ereport(ERROR,
545541
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
546-
errmsg("trigger functions can only be called as triggers"),
547-
errhint("CALLED_AS_TRIGGER=%d CALLED_AS_EVENT_TRIGGER=%d",
548-
CALLED_AS_TRIGGER(fcinfo),CALLED_AS_EVENT_TRIGGER(fcinfo))));
549-
}
542+
errmsg("trigger functions can only be called as triggers")));
550543
else
551544
ereport(ERROR,
552545
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp