Fix #8597 - Unable to restore database to Firebird 6.0 (with schemas) from ODS 13.1 if stored procedure/function has TYPE OF COLUMN parameter systemtable.systemcolumn.

Author: asfernandes

src/jrd/Routine.cpp

@@ -191,7 +191,7 @@ void Routine::parseMessages(thread_db* tdbb, CompilerScratch* csb, BlrReader blr
 	csb->csb_schema = name.schema;
 	csb->csb_blr_reader = blrReader;
 
-	csb->csb_blr_reader.parseHeader();
+	PAR_getBlrVersionAndFlags(csb);
 
 	if (csb->csb_blr_reader.getByte() != blr_begin)
 		status_exception::raise(Arg::Gds(isc_metadata_corrupt));

src/jrd/par.cpp

@@ -79,7 +79,6 @@ static NodeParseFunc blr_parsers[256] = {NULL};
 
 static void par_error(BlrReader& blrReader, const Arg::StatusVector& v, bool isSyntaxError = true);
 static PlanNode* par_plan(thread_db*, CompilerScratch*);
-static void getBlrVersionAndFlags(CompilerScratch* csb);
 static void parseSubRoutines(thread_db* tdbb, CompilerScratch* csb);
 static void setNodeLineColumn(CompilerScratch* csb, DmlNode* node, ULONG blrOffset);
 
@@ -186,7 +185,7 @@ DmlNode* PAR_blr(thread_db* tdbb, const MetaName* schema, jrd_rel* relation, con
 
 	csb->csb_blr_reader = BlrReader(blr, blr_length);
 
-	getBlrVersionAndFlags(csb);
+	PAR_getBlrVersionAndFlags(csb);
 
 	csb->csb_node = PAR_parse_node(tdbb, csb);
 
@@ -239,7 +238,7 @@ BoolExprNode* PAR_validation_blr(thread_db* tdbb, const MetaName* schema, jrd_re
 
 	csb->csb_blr_reader = BlrReader(blr, blr_length);
 
-	getBlrVersionAndFlags(csb);
+	PAR_getBlrVersionAndFlags(csb);
 
 	if (csb->csb_blr_reader.peekByte() == blr_stmt_expr)
 	{
@@ -621,6 +620,38 @@ ValueExprNode* PAR_gen_field(thread_db* tdbb, StreamType stream, USHORT id, bool
 }
 
 
+// Get the BLR version from the CSB stream and complain if it's unknown.
+void PAR_getBlrVersionAndFlags(CompilerScratch* csb)
+{
+	BlrReader::Flags flags;
+	const SSHORT version = csb->csb_blr_reader.parseHeader(&flags);
+
+	switch (version)
+	{
+		case blr_version4:
+			csb->blrVersion = 4;
+			break;
+
+		case blr_version5:
+			csb->blrVersion = 5;
+			break;
+
+		//case blr_version6:
+		//	csb->blrVersion = 6;
+		//	break;
+
+		default:
+			PAR_error(csb,
+				Arg::Gds(isc_metadata_corrupt) <<
+				Arg::Gds(isc_wroblrver2) <<
+					Arg::Num(blr_version4) << Arg::Num(blr_version5/*6*/) << Arg::Num(version));
+	}
+
+	if (flags.searchSystemSchema)
+		csb->csb_g_flags |= csb_search_system_schema;
+}
+
+
 ValueExprNode* PAR_make_field(thread_db* tdbb, CompilerScratch* csb, USHORT context,
 	const MetaName& base_field)
 {
@@ -726,7 +757,7 @@ CompilerScratch* PAR_parse(thread_db* tdbb, const UCHAR* blr, ULONG blr_length,
 		csb->csb_schema = SYSTEM_SCHEMA;
 	}
 
-	getBlrVersionAndFlags(csb);
+	PAR_getBlrVersionAndFlags(csb);
 
 	if (dbginfo_length > 0)
 		DBG_parse_debug_info(dbginfo_length, dbginfo, *csb->csb_dbg_info);
@@ -1663,34 +1694,6 @@ void PAR_warning(const Arg::StatusVector& v)
 }
 
 
-// Get the BLR version from the CSB stream and complain if it's unknown.
-static void getBlrVersionAndFlags(CompilerScratch* csb)
-{
-	BlrReader::Flags flags;
-	const SSHORT version = csb->csb_blr_reader.parseHeader(&flags);
-
-	switch (version)
-	{
-	case blr_version4:
-		csb->blrVersion = 4;
-		break;
-	case blr_version5:
-		csb->blrVersion = 5;
-		break;
-	//case blr_version6:
-	//	csb->blrVersion = 6;
-	//	break;
-	default:
-		PAR_error(csb, Arg::Gds(isc_metadata_corrupt) <<
-				   Arg::Gds(isc_wroblrver2) << Arg::Num(blr_version4) << Arg::Num(blr_version5/*6*/) <<
-						Arg::Num(version));
-	}
-
-	if (flags.searchSystemSchema)
-		csb->csb_g_flags |= csb_search_system_schema;
-}
-
-
 // Parse subroutines.
 static void parseSubRoutines(thread_db* tdbb, CompilerScratch* csb)
 {

src/jrd/par_proto.h

@@ -62,6 +62,7 @@ USHORT			PAR_desc(Jrd::thread_db*, Jrd::CompilerScratch*, dsc*, Jrd::ItemInfo* =
 void			PAR_error(Jrd::CompilerScratch*, const Firebird::Arg::StatusVector&, bool isSyntaxError = true);
 SSHORT			PAR_find_proc_field(const Jrd::jrd_prc*, const Jrd::MetaName&);
 Jrd::ValueExprNode* PAR_gen_field(Jrd::thread_db* tdbb, StreamType stream, USHORT id, bool byId = false);
+void PAR_getBlrVersionAndFlags(Jrd::CompilerScratch* csb);
 Jrd::ValueExprNode* PAR_make_field(Jrd::thread_db*, Jrd::CompilerScratch*, USHORT, const Jrd::MetaName&);
 Jrd::CompoundStmtNode*	PAR_make_list(Jrd::thread_db*, Jrd::StmtNodeStack&);
 ULONG			PAR_marks(Jrd::CompilerScratch*);