fix build and tests for current dev

Author: okbob

expected/plpgsql_check_active_4.out

@@ -3175,8 +3175,7 @@ end;
 $$ language plpgsql;
 -- should to fail
 select testseq();
-ERROR:  cannot open relation "test_table"
-DETAIL:  This operation is not supported for tables.
+ERROR:  "test_table" is not a sequence
 CONTEXT:  SQL statement "SELECT nextval('test_table')"
 PL/pgSQL function testseq() line 3 at PERFORM
 select * from plpgsql_check_function('testseq()', fatal_errors := false);

src/check_function.c

@@ -1005,6 +1005,11 @@ plpgsql_check_setup_fcinfo(plpgsql_check_info *cinfo,
 			TupleDescInitEntry(resultTupleDesc,
 							   (AttrNumber) 1, "__result__",
 							   result_rettype, -1, 0);
+
+#if PG_VERSION_NUM >= 190000
+			TupleDescFinalize(resultTupleDesc);
+#endif
+
 			resultTupleDesc = BlessTupleDesc(resultTupleDesc);
 		}
 	}

src/format.c

@@ -21,6 +21,10 @@
 #include "utils/json.h"
 #include "utils/xml.h"
 
+#if PG_VERSION_NUM >= 190000
+#include "utils/tuplestore.h"
+#endif
+
 static void put_text_line(plpgsql_check_result_info *ri, const char *message, int len);
 static const char *error_level_str(int level);
 static void init_tag(plpgsql_check_result_info *ri, Oid fn_oid);

src/plpgsql_check.h

@@ -7,6 +7,10 @@
 #include "access/tupdesc.h"
 #include "storage/ipc.h"
 
+#if PG_VERSION_NUM >= 190000
+#include "portability/instr_time.h"
+#endif
+
 typedef uint64 pc_queryid;
 #define NOQUERYID				(UINT64CONST(0))
 

src/typdesc.c

@@ -432,6 +432,10 @@ plpgsql_check_expr_get_desc(PLpgSQL_checkstate *cstate,
 
 			TupleDescInitEntry(rettupdesc, 1, "__array_element__", elemtype, -1, 0);
 
+#if PG_VERSION_NUM >= 190000
+			TupleDescFinalize(rettupdesc);
+#endif
+
 			FreeTupleDesc(tupdesc);
 			BlessTupleDesc(rettupdesc);
 
@@ -580,6 +584,10 @@ plpgsql_check_expr_get_desc(PLpgSQL_checkstate *cstate,
 								i++;
 							}
 
+#if PG_VERSION_NUM >= 190000
+							TupleDescFinalize(rettupdesc);
+#endif
+
 							FreeTupleDesc(tupdesc);
 							BlessTupleDesc(rettupdesc);