Skip to content

Commit 71090b6

Browse files
okbobokbob
committed
fix regress tests
1 parent e029a85 commit 71090b6

File tree

2 files changed

+98
-96
lines changed

2 files changed

+98
-96
lines changed

‎expected/plpgsql_check_active_1.out

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8313,6 +8313,7 @@ ERROR: returned record type does not match expected record type
83138313
drop function test_function();
83148314
drop function test_function33();
83158315
drop type testtype;
8316+
set plpgsql_check.mode to default;
83168317
-- should not to raise false alarm
83178318
create type c1 as (
83188319
a text
@@ -8694,18 +8695,18 @@ set plpgsql_check.tracer_test_mode = true;
86948695
select trace_test(3);
86958696
NOTICE: #0 ->> start of function trace_test(integer) (oid=0, tnl=1)
86968697
NOTICE: #0 "b" => '3'
8697-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8698-
NOTICE: #2 context: SQL statement "SELECT nested_trace_test(r)"
8699-
NOTICE: #2 "a" => '0'
8700-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8701-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8702-
NOTICE: #2 context: SQL statement "SELECT nested_trace_test(r)"
8703-
NOTICE: #2 "a" => '1'
8704-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8705-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8706-
NOTICE: #2 context: SQL statement "SELECT nested_trace_test(r)"
8707-
NOTICE: #2 "a" => '2'
8708-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8698+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8699+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8700+
NOTICE: #1 "a" => '0'
8701+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8702+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8703+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8704+
NOTICE: #1 "a" => '1'
8705+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8706+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8707+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8708+
NOTICE: #1 "a" => '2'
8709+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87098710
NOTICE: #0 <<- end of function trace_test (elapsed time=0.010 ms)
87108711
trace_test
87118712
------------
@@ -8720,41 +8721,41 @@ NOTICE: #0.1 3 --> start of statement block (tnl=1)
87208721
NOTICE: #0.2 4 --> start of FOR with integer loop variable (tnl=1)
87218722
NOTICE: #0.3 6 --> start of assignment nested_trace_test(r) (tnl=1)
87228723
NOTICE: #0.3 "r" => '0'
8723-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8724-
NOTICE: #2 context: SQL statement "SELECT nested_trace_test(r)"
8725-
NOTICE: #2 "a" => '0'
8726-
NOTICE: #2.1 2 --> start of statement block (tnl=1)
8727-
NOTICE: #2.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8728-
NOTICE: #2.2 "a" => '0'
8729-
NOTICE: #2.1 <-- end of RETURN (elapsed time=0.010 ms)
8730-
NOTICE: #2.2 <-- end of statement block (elapsed time=0.010 ms)
8731-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8724+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8725+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8726+
NOTICE: #1 "a" => '0'
8727+
NOTICE: #1.1 2 --> start of statement block (tnl=1)
8728+
NOTICE: #1.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8729+
NOTICE: #1.2 "a" => '0'
8730+
NOTICE: #1.1 <-- end of RETURN (elapsed time=0.010 ms)
8731+
NOTICE: #1.2 <-- end of statement block (elapsed time=0.010 ms)
8732+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87328733
NOTICE: #0.2 <-- end of assignment (elapsed time=0.010 ms)
87338734
NOTICE: #0.3 "r" => '1'
87348735
NOTICE: #0.3 6 --> start of assignment nested_trace_test(r) (tnl=1)
87358736
NOTICE: #0.3 "r" => '1'
8736-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8737-
NOTICE: #2 context: SQL statement "SELECT nested_trace_test(r)"
8738-
NOTICE: #2 "a" => '1'
8739-
NOTICE: #2.1 2 --> start of statement block (tnl=1)
8740-
NOTICE: #2.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8741-
NOTICE: #2.2 "a" => '1'
8742-
NOTICE: #2.1 <-- end of RETURN (elapsed time=0.010 ms)
8743-
NOTICE: #2.2 <-- end of statement block (elapsed time=0.010 ms)
8744-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8737+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8738+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8739+
NOTICE: #1 "a" => '1'
8740+
NOTICE: #1.1 2 --> start of statement block (tnl=1)
8741+
NOTICE: #1.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8742+
NOTICE: #1.2 "a" => '1'
8743+
NOTICE: #1.1 <-- end of RETURN (elapsed time=0.010 ms)
8744+
NOTICE: #1.2 <-- end of statement block (elapsed time=0.010 ms)
8745+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87458746
NOTICE: #0.2 <-- end of assignment (elapsed time=0.010 ms)
87468747
NOTICE: #0.3 "r" => '2'
87478748
NOTICE: #0.3 6 --> start of assignment nested_trace_test(r) (tnl=1)
87488749
NOTICE: #0.3 "r" => '2'
8749-
NOTICE: #2 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8750-
NOTICE: #2 context: SQL statement "SELECT nested_trace_test(r)"
8751-
NOTICE: #2 "a" => '2'
8752-
NOTICE: #2.1 2 --> start of statement block (tnl=1)
8753-
NOTICE: #2.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8754-
NOTICE: #2.2 "a" => '2'
8755-
NOTICE: #2.1 <-- end of RETURN (elapsed time=0.010 ms)
8756-
NOTICE: #2.2 <-- end of statement block (elapsed time=0.010 ms)
8757-
NOTICE: #2 <<- end of function nested_trace_test (elapsed time=0.010 ms)
8750+
NOTICE: #1 ->> start of function nested_trace_test(integer) (oid=0, tnl=1)
8751+
NOTICE: #1 context: PL/pgSQL function trace_test(integer) line 6 at assignment
8752+
NOTICE: #1 "a" => '2'
8753+
NOTICE: #1.1 2 --> start of statement block (tnl=1)
8754+
NOTICE: #1.2 3 --> start of RETURN (expr='a + 1') (tnl=1)
8755+
NOTICE: #1.2 "a" => '2'
8756+
NOTICE: #1.1 <-- end of RETURN (elapsed time=0.010 ms)
8757+
NOTICE: #1.2 <-- end of statement block (elapsed time=0.010 ms)
8758+
NOTICE: #1 <<- end of function nested_trace_test (elapsed time=0.010 ms)
87588759
NOTICE: #0.2 <-- end of assignment (elapsed time=0.010 ms)
87598760
NOTICE: #0.3 "r" => '3'
87608761
NOTICE: #0.1 <-- end of FOR with integer loop variable (elapsed time=0.010 ms)
@@ -8812,15 +8813,15 @@ NOTICE: #0.1 3 --> start of statement block (tnl=1)
88128813
NOTICE: #0.2 4 --> start of FOR with integer loop variable (tnl=1)
88138814
NOTICE: #0.3 6 --> start of perform plpgsql_check_pragma('disable: .. (tnl=1)
88148815
NOTICE: #0.2 <-- end of PERFORM (elapsed time=0.010 ms)
8815-
NOTICE: #2.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8816-
NOTICE: #2.3 "a" => '0'
8817-
NOTICE: #2.2 <-- end of RETURN (elapsed time=0.010 ms)
8818-
NOTICE: #2.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8819-
NOTICE: #2.3 "a" => '1'
8820-
NOTICE: #2.2 <-- end of RETURN (elapsed time=0.010 ms)
8821-
NOTICE: #2.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8822-
NOTICE: #2.3 "a" => '2'
8823-
NOTICE: #2.2 <-- end of RETURN (elapsed time=0.010 ms)
8816+
NOTICE: #1.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8817+
NOTICE: #1.3 "a" => '0'
8818+
NOTICE: #1.2 <-- end of RETURN (elapsed time=0.010 ms)
8819+
NOTICE: #1.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8820+
NOTICE: #1.3 "a" => '1'
8821+
NOTICE: #1.2 <-- end of RETURN (elapsed time=0.010 ms)
8822+
NOTICE: #1.3 4 --> start of RETURN (expr='a + 1') (tnl=1)
8823+
NOTICE: #1.3 "a" => '2'
8824+
NOTICE: #1.2 <-- end of RETURN (elapsed time=0.010 ms)
88248825
NOTICE: #0.1 <-- end of FOR with integer loop variable (elapsed time=0.010 ms)
88258826
NOTICE: #0.5 9 --> start of RETURN (tnl=1)
88268827
NOTICE: #0.5 "r" => '3'

‎expected/plpgsql_check_active_2.out

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

0 commit comments

Comments
 (0)