fix compilation and tests for 9.4

Author: okbob

expected/README

@@ -4,3 +4,5 @@ plpgsql_check_active_4.out			PostgreSQL 9.6
 plpgsql_check_active.out			PostgreSQL 11, 12
 plpgsql_check_active_1.out			PostgreSQL 10
 
+plpgsql_check_passive_2.out			PostgreSQL 9.4
+

expected/plpgsql_check_active-9.4.out

@@ -296,10 +296,11 @@ select * from plpgsql_check_function('fx2()', performance_warnings := true);
 -----------------------------------------------------------------------------------------
  performance:42804:5:assignment:target type has type modificator
  Hint: Usage of type modificator enforces slower IO casting.
+ Context: at assignment to variable "pa.pa_id" declared on line 0
  warning extra:00000:2:DECLARE:never read variable "_pa"
  performance:00000:routine is marked as VOLATILE, should be STABLE
  Hint: When you fix this issue, please, recheck other functions that uses this function.
-(5 rows)
+(6 rows)
 
 drop function fx2();
 create or replace function test_lab()

expected/plpgsql_check_active_2.out

@@ -252,8 +252,14 @@ begin
 end;
 $$ language plpgsql;
 select f1();
-ERROR:  too many parameters specified for RAISE
-CONTEXT:  compilation of PL/pgSQL function "f1" near line 4
+WARNING:  too many parameters specified for RAISE
+CONTEXT:  PL/pgSQL function f1() line 4 at RAISE
+PL/pgSQL function f1() line 4 at RAISE
+ f1 
+----
+ 
+(1 row)
+
 drop function f1();
 create or replace function f1()
 returns void as $$
@@ -264,6 +270,12 @@ begin
 end;
 $$ language plpgsql;
 select f1();
-ERROR:  too few parameters specified for RAISE
-CONTEXT:  compilation of PL/pgSQL function "f1" near line 4
+WARNING:  too few parameters specified for RAISE
+CONTEXT:  PL/pgSQL function f1() line 4 at RAISE
+PL/pgSQL function f1() line 4 at RAISE
+ f1 
+----
+ 
+(1 row)
+
 drop function f1();

expected/plpgsql_check_passive.out

@@ -85,7 +85,7 @@ end;
 $$ language plpgsql;
 select f1();
 ERROR:  record "r" has no field "c"
-CONTEXT:  PL/pgSQL function f1() line 6 at assignment
+CONTEXT:  PL/pgSQL function f1() line 6 at assignment to field "c" of variable "r" declared on line 2
 drop function f1();
 drop function g1();
 create function f1()
@@ -103,7 +103,7 @@ ERROR:  column "a" does not exist
 LINE 1: SELECT a + b
                ^
 QUERY:  SELECT a + b
-CONTEXT:  PL/pgSQL function f1() line 5 at assignment
+CONTEXT:  PL/pgSQL function f1() line 5 at assignment to variable "r" declared on line 2
 drop function f1();
 create or replace function f1()
 returns void as $$
@@ -119,7 +119,7 @@ ERROR:  column "c" does not exist
 LINE 1: SELECT c+10
                ^
 QUERY:  SELECT c+10
-CONTEXT:  PL/pgSQL function f1() line 5 at assignment
+CONTEXT:  PL/pgSQL function f1() line 5 at assignment to element of variable "r" declared on line 2
 drop function f1();
 create or replace function f1()
 returns void as $$
@@ -132,7 +132,7 @@ end;
 $$ language plpgsql;
 select f1();
 ERROR:  subscripted object is not an array
-CONTEXT:  PL/pgSQL function f1() line 5 at assignment
+CONTEXT:  PL/pgSQL function f1() line 5 at assignment to element of variable "r" declared on line 2
 drop function f1();
 create or replace function f1()
 returns void as $$

expected/plpgsql_check_passive_2.out

@@ -2441,8 +2441,8 @@ begin
 end;
 $$ language plpgsql volatile;
 
-select * from plpgsql_check_function('flag_test1(int)', performance_warnings => true);
-select * from plpgsql_check_function('flag_test2(int)', performance_warnings => true);
+select * from plpgsql_check_function('flag_test1(int)', performance_warnings := true);
+select * from plpgsql_check_function('flag_test2(int)', performance_warnings := true);
 
 drop table fufu;
 drop function flag_test1(int);
@@ -2576,7 +2576,7 @@ end;
 $$ language plpgsql;
 
 -- should not to crash
-select * from plpgsql_check_function('test_crash', fatal_errors=>false);
-select * from plpgsql_check_function('test_crash', fatal_errors=>true);
+select * from plpgsql_check_function('test_crash', fatal_errors := false);
+select * from plpgsql_check_function('test_crash', fatal_errors := true);
 
 drop function test_crash();

sql/plpgsql_check_active.sql

@@ -13,8 +13,17 @@
 
 #include "access/tupconvert.h"
 #include "catalog/pg_type.h"
+
+#if PG_VERSION_NUM > 90500
+
 #include "common/keywords.h"
 
+#else
+
+#include "parser/keywords.h"
+
+#endif
+
 static void check_stmts(PLpgSQL_checkstate *cstate, List *stmts, int *closing, List **exceptions);
 static PLpgSQL_stmt_stack_item * push_stmt_to_stmt_stack(PLpgSQL_checkstate *cstate);
 static void pop_stmt_from_stmt_stack(PLpgSQL_checkstate *cstate);
@@ -164,13 +173,28 @@ plpgsql_check_stmt(PLpgSQL_checkstate *cstate, PLpgSQL_stmt *stmt, int *closing,
 
 							cstate->estate->err_text = str.data;
 
+#if PG_VERSION_NUM >= 110000
+
 							if (var->default_val)
 								plpgsql_check_assignment(cstate,
 														 var->default_val,
 														 NULL,
 														 NULL,
 														 var->dno);
 
+#else
+
+							if (d->dtype == PLPGSQL_DTYPE_VAR &&
+									((PLpgSQL_var *) var)->default_val)
+								plpgsql_check_assignment(cstate,
+														 ((PLpgSQL_var *) var)->default_val,
+														 NULL,
+														 NULL,
+														 var->dno);
+
+
+#endif
+
 							cstate->estate->err_text = NULL;
 							pfree(str.data);
 						}