Fix #8063 - (var)char variables/parameters assignments fail in Stored Procedures with subroutines.

asfernandes · asfernandes · commit 73551f357e01 · 2024-04-02T11:09:54.000-03:00
diff --git a/src/dsql/ExprNodes.cpp b/src/dsql/ExprNodes.cpp
@@ -14207,10 +14207,12 @@ dsc* VariableNode::execute(thread_db* tdbb, Request* request) const
 			request->req_flags |= req_null;
 		else
 		{
-			EVL_make_value(tdbb, &varImpure->vlu_desc, impure);
+			auto varDesc = varImpure->vlu_desc;
 
-			if (impure->vlu_desc.dsc_dtype == dtype_text)
-				INTL_adjust_text_descriptor(tdbb, &impure->vlu_desc);
+			if (varDesc.dsc_dtype == dtype_text)
+				INTL_adjust_text_descriptor(tdbb, &varDesc);
+
+			EVL_make_value(tdbb, &varDesc, impure);
 		}
 
 		if (!(varImpure->vlu_flags & VLU_checked))

Original file line number	Diff line number	Diff line change
`@@ -14207,10 +14207,12 @@ dsc* VariableNode::execute(thread_db* tdbb, Request* request) const`
`14207`	`14207`	`request->req_flags \|= req_null;`
`14208`	`14208`	`else`
`14209`	`14209`	`{`
`14210`		`- EVL_make_value(tdbb, &varImpure->vlu_desc, impure);`
	`14210`	`+ auto varDesc = varImpure->vlu_desc;`
`14211`	`14211`
`14212`		`- if (impure->vlu_desc.dsc_dtype == dtype_text)`
`14213`		`- INTL_adjust_text_descriptor(tdbb, &impure->vlu_desc);`
	`14212`	`+ if (varDesc.dsc_dtype == dtype_text)`
	`14213`	`+ INTL_adjust_text_descriptor(tdbb, &varDesc);`
	`14214`	`+`
	`14215`	`+ EVL_make_value(tdbb, &varDesc, impure);`
`14214`	`14216`	`}`
`14215`	`14217`
`14216`	`14218`	`if (!(varImpure->vlu_flags & VLU_checked))`