Fix #8625 - Range based FOR is broken with a DO SUSPEND without BEGIN...END.

asfernandes · asfernandes · commit cfc1185e208f · 2025-06-25T07:46:07.000-03:00
diff --git a/src/dsql/StmtNodes.cpp b/src/dsql/StmtNodes.cpp
@@ -6241,6 +6241,7 @@ const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeStat
 		}
 
 		case Request::req_return:
+		case Request::req_sync:
 		{
 			const auto variableDesc = EVL_expr(tdbb, request, variable);
 
@@ -6250,7 +6251,7 @@ const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeStat
 				return parentStmt;
 			}
 
-			if (request->req_operation == Request::req_return)
+			if (request->req_operation != Request::req_evaluate)
 			{
 				impure_value nextValue;
 

Original file line number	Diff line number	Diff line change
`@@ -6241,6 +6241,7 @@ const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeStat`
`6241`	`6241`	`}`
`6242`	`6242`
`6243`	`6243`	`case Request::req_return:`
	`6244`	`+ case Request::req_sync:`
`6244`	`6245`	`{`
`6245`	`6246`	`const auto variableDesc = EVL_expr(tdbb, request, variable);`
`6246`	`6247`
`@@ -6250,7 +6251,7 @@ const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeStat`
`6250`	`6251`	`return parentStmt;`
`6251`	`6252`	`}`
`6252`	`6253`
`6253`		`- if (request->req_operation == Request::req_return)`
	`6254`	`+ if (request->req_operation != Request::req_evaluate)`
`6254`	`6255`	`{`
`6255`	`6256`	`impure_value nextValue;`
`6256`	`6257`