Fixed bug CORE-2032 : Stored procedure recursively called by calculated field fails after reconnect

hvlad · hvlad · commit b6b6897dfa01 · 2021-02-03T19:31:31.000+02:00
diff --git a/src/dsql/ExprNodes.cpp b/src/dsql/ExprNodes.cpp
@@ -6570,7 +6570,8 @@ ValueExprNode* FieldNode::pass1(thread_db* tdbb, CompilerScratch* csb)
 	jrd_rel* relation = tail->csb_relation;
 	jrd_fld* field;
 
-	if (!relation || !(field = MET_get_field(relation, fieldId)))
+	if (!relation || !(field = MET_get_field(relation, fieldId)) ||
+		(field->fld_flags & FLD_parse_computed))
 	{
 		if (relation && (relation->rel_flags & REL_being_scanned))
 			csb->csb_g_flags |= csb_reload;
diff --git a/src/jrd/Relation.h b/src/jrd/Relation.h
@@ -474,6 +474,8 @@ inline jrd_rel::GCShared::~GCShared()
 
 // Field block, one for each field in a scanned relation
 
+const USHORT FLD_parse_computed = 0x0001;		// computed expression is being parsed
+
 class jrd_fld : public pool_alloc<type_fld>
 {
 public:
@@ -489,6 +491,7 @@ class jrd_fld : public pool_alloc<type_fld>
 	MetaName	fld_generator_name;	// identity generator name
 	MetaNamePair	fld_source_rel_field;	// Relation/field source name
 	Nullable<IdentityType> fld_identity_type;
+	USHORT fld_flags;
 
 public:
 	explicit jrd_fld(MemoryPool& p)
diff --git a/src/jrd/met.epp b/src/jrd/met.epp
@@ -4072,6 +4072,8 @@ void MET_scan_relation(thread_db* tdbb, jrd_rel* relation)
 
 			case RSR_computed_blr:
 				{
+					AutoSetRestoreFlag<USHORT> flag(&field->fld_flags, FLD_parse_computed, true);
+
 					DmlNode* nod = dependencies ?
 						MET_get_dependencies(tdbb, relation, p, length, csb, NULL, NULL, NULL,
 							field->fld_name, obj_computed, 0, depTrans) :

Original file line number	Diff line number	Diff line change
`@@ -6570,7 +6570,8 @@ ValueExprNode* FieldNode::pass1(thread_db* tdbb, CompilerScratch* csb)`
`6570`	`6570`	`jrd_rel* relation = tail->csb_relation;`
`6571`	`6571`	`jrd_fld* field;`
`6572`	`6572`
`6573`		`- if (!relation \|\| !(field = MET_get_field(relation, fieldId)))`
	`6573`	`+ if (!relation \|\| !(field = MET_get_field(relation, fieldId)) \|\|`
	`6574`	`+ (field->fld_flags & FLD_parse_computed))`
`6574`	`6575`	`{`
`6575`	`6576`	`if (relation && (relation->rel_flags & REL_being_scanned))`
`6576`	`6577`	`csb->csb_g_flags \|= csb_reload;`
Original file line number	Diff line number	Diff line change
`@@ -4072,6 +4072,8 @@ void MET_scan_relation(thread_db* tdbb, jrd_rel* relation)`
`4072`	`4072`
`4073`	`4073`	`case RSR_computed_blr:`
`4074`	`4074`	`{`
	`4075`	`+ AutoSetRestoreFlag<USHORT> flag(&field->fld_flags, FLD_parse_computed, true);`
	`4076`	`+`
`4075`	`4077`	`DmlNode* nod = dependencies ?`
`4076`	`4078`	`MET_get_dependencies(tdbb, relation, p, length, csb, NULL, NULL, NULL,`
`4077`	`4079`	`field->fld_name, obj_computed, 0, depTrans) :`