Skip to content

Commit db53b1f

Browse files
okbobokbob
committed
release plans created by plpgsql_check
in passive mode. Without it, the plan can be inconsistent for plpgsql and some plpgsql assertions. the trackers tests was executed with enabled passive check. Previously, the plans created by passive check was not removed, and it did impacts on deep of contexts and result of tracking. This patch fixes output of regress tests, and disable passive check mode before tracker tests. related to #174
1 parent a7585cc commit db53b1f

File tree

3 files changed

+52
-48
lines changed

3 files changed

+52
-48
lines changed

‎expected/plpgsql_check_active.out

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8315,6 +8315,7 @@ ERROR: returned record type does not match expected record type
83158315
drop function test_function();
83168316
drop function test_function33();
83178317
drop type testtype;
8318+
set plpgsql_check.mode to default;
83188319
-- should not to raise false alarm
83198320
create type c1 as (
83208321
a text
@@ -8692,18 +8693,18 @@ set plpgsql_check.tracer_test_mode = true;
86928693
select trace_test(3);
86938694
NOTICE: #0 ->> start of function trace_test(integer) (oid=0, tnl=1)
86948695
NOTICE: #0 "b" => '3'
8695-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8696-
NOTICE: #2 context: PL/pgSQL assignment "r := nested_trace_test(r)"
8697-
NOTICE: #2 "a" => '0'
8698-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8699-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8700-
NOTICE: #2 context: PL/pgSQL assignment "r := nested_trace_test(r)"
8701-
NOTICE: #2 "a" => '1'
8702-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8703-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8704-
NOTICE: #2 context: PL/pgSQL assignment "r := nested_trace_test(r)"
8705-
NOTICE: #2 "a" => '2'
8706-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8696+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8697+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8698+
NOTICE: #1 "a" => '0'
8699+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8700+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8701+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8702+
NOTICE: #1 "a" => '1'
8703+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8704+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8705+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8706+
NOTICE: #1 "a" => '2'
8707+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87078708
NOTICE: #0 <<- end of function trace_test (elapsed time=0.010 ms)
87088709
trace_test
87098710
------------
@@ -8718,41 +8719,41 @@ NOTICE: #0.1 3 --> start of statement block (tnl=1)
87188719
NOTICE: #0.2 4 --> start of FOR with integer loop variable (tnl=1)
87198720
NOTICE: #0.3 6 --> start of assignment r := nested_trace_test(r) (tnl=1)
87208721
NOTICE: #0.3 "r" => '0'
8721-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8722-
NOTICE: #2 context: PL/pgSQL assignment "r := nested_trace_test(r)"
8723-
NOTICE: #2 "a" => '0'
8724-
NOTICE: #2.1 2 --> start of statement block (tnl=1)
8725-
NOTICE: #2.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8726-
NOTICE: #2.2 "a" => '0'
8727-
NOTICE: #2.1 <-- end of RETURN (elapsed time=0.010 ms)
8728-
NOTICE: #2.2 <-- end of statement block (elapsed time=0.010 ms)
8729-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8722+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8723+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8724+
NOTICE: #1 "a" => '0'
8725+
NOTICE: #1.1 2 --> start of statement block (tnl=1)
8726+
NOTICE: #1.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8727+
NOTICE: #1.2 "a" => '0'
8728+
NOTICE: #1.1 <-- end of RETURN (elapsed time=0.010 ms)
8729+
NOTICE: #1.2 <-- end of statement block (elapsed time=0.010 ms)
8730+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87308731
NOTICE: #0.2 <-- end of assignment (elapsed time=0.010 ms)
87318732
NOTICE: #0.3 "r" => '1'
87328733
NOTICE: #0.3 6 --> start of assignment r := nested_trace_test(r) (tnl=1)
87338734
NOTICE: #0.3 "r" => '1'
8734-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8735-
NOTICE: #2 context: PL/pgSQL assignment "r := nested_trace_test(r)"
8736-
NOTICE: #2 "a" => '1'
8737-
NOTICE: #2.1 2 --> start of statement block (tnl=1)
8738-
NOTICE: #2.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8739-
NOTICE: #2.2 "a" => '1'
8740-
NOTICE: #2.1 <-- end of RETURN (elapsed time=0.010 ms)
8741-
NOTICE: #2.2 <-- end of statement block (elapsed time=0.010 ms)
8742-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8735+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8736+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8737+
NOTICE: #1 "a" => '1'
8738+
NOTICE: #1.1 2 --> start of statement block (tnl=1)
8739+
NOTICE: #1.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8740+
NOTICE: #1.2 "a" => '1'
8741+
NOTICE: #1.1 <-- end of RETURN (elapsed time=0.010 ms)
8742+
NOTICE: #1.2 <-- end of statement block (elapsed time=0.010 ms)
8743+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87438744
NOTICE: #0.2 <-- end of assignment (elapsed time=0.010 ms)
87448745
NOTICE: #0.3 "r" => '2'
87458746
NOTICE: #0.3 6 --> start of assignment r := nested_trace_test(r) (tnl=1)
87468747
NOTICE: #0.3 "r" => '2'
8747-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8748-
NOTICE: #2 context: PL/pgSQL assignment "r := nested_trace_test(r)"
8749-
NOTICE: #2 "a" => '2'
8750-
NOTICE: #2.1 2 --> start of statement block (tnl=1)
8751-
NOTICE: #2.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8752-
NOTICE: #2.2 "a" => '2'
8753-
NOTICE: #2.1 <-- end of RETURN (elapsed time=0.010 ms)
8754-
NOTICE: #2.2 <-- end of statement block (elapsed time=0.010 ms)
8755-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8748+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8749+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8750+
NOTICE: #1 "a" => '2'
8751+
NOTICE: #1.1 2 --> start of statement block (tnl=1)
8752+
NOTICE: #1.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8753+
NOTICE: #1.2 "a" => '2'
8754+
NOTICE: #1.1 <-- end of RETURN (elapsed time=0.010 ms)
8755+
NOTICE: #1.2 <-- end of statement block (elapsed time=0.010 ms)
8756+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87568757
NOTICE: #0.2 <-- end of assignment (elapsed time=0.010 ms)
87578758
NOTICE: #0.3 "r" => '3'
87588759
NOTICE: #0.1 <-- end of FOR with integer loop variable (elapsed time=0.010 ms)
@@ -8810,15 +8811,15 @@ NOTICE: #0.1 3 --> start of statement block (tnl=1)
88108811
NOTICE: #0.2 4 --> start of FOR with integer loop variable (tnl=1)
88118812
NOTICE: #0.3 6 --> start of perform plpgsql_check_pragma('disable: .. (tnl=1)
88128813
NOTICE: #0.2 <-- end of PERFORM (elapsed time=0.010 ms)
8813-
NOTICE: #2.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8814-
NOTICE: #2.3 "a" => '0'
8815-
NOTICE: #2.2 <-- end of RETURN (elapsed time=0.010 ms)
8816-
NOTICE: #2.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8817-
NOTICE: #2.3 "a" => '1'
8818-
NOTICE: #2.2 <-- end of RETURN (elapsed time=0.010 ms)
8819-
NOTICE: #2.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8820-
NOTICE: #2.3 "a" => '2'
8821-
NOTICE: #2.2 <-- end of RETURN (elapsed time=0.010 ms)
8814+
NOTICE: #1.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8815+
NOTICE: #1.3 "a" => '0'
8816+
NOTICE: #1.2 <-- end of RETURN (elapsed time=0.010 ms)
8817+
NOTICE: #1.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8818+
NOTICE: #1.3 "a" => '1'
8819+
NOTICE: #1.2 <-- end of RETURN (elapsed time=0.010 ms)
8820+
NOTICE: #1.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8821+
NOTICE: #1.3 "a" => '2'
8822+
NOTICE: #1.2 <-- end of RETURN (elapsed time=0.010 ms)
88228823
NOTICE: #0.1 <-- end of FOR with integer loop variable (elapsed time=0.010 ms)
88238824
NOTICE: #0.5 9 --> start of RETURN (tnl=1)
88248825
NOTICE: #0.5 "r" => '3'

‎sql/plpgsql_check_active.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4842,6 +4842,7 @@ drop function test_function33();
48424842

48434843
drop type testtype;
48444844

4845+
set plpgsql_check.mode to default;
48454846

48464847
-- should not to raise false alarm
48474848
create type c1 as (

‎src/check_function.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,8 @@ passive_check_func_beg(PLpgSQL_execstate *estate, PLpgSQL_function *func, void *
429429
plpgsql_check_report_unused_variables(&cstate);
430430
plpgsql_check_report_too_high_volatility(&cstate);
431431
}
432+
433+
release_exprs(cstate.exprs);
432434
}
433435
PG_CATCH();
434436
{

0 commit comments

Comments
 (0)