finalize everywhere

Author: James Cor

engine.go

@@ -447,8 +447,7 @@ func (e *Engine) QueryWithBindings(ctx *sql.Context, query string, parsed sqlpar
 		return nil, nil, nil, err
 	}
 
-	iter = rowexec.AddTransactionCommittingIter(iter, qFlags)
-	iter = rowexec.AddExpressionCloser(analyzed, iter)
+	iter = finalizeIters(analyzed, qFlags, iter)
 
 	return analyzed.Schema(), iter, qFlags, nil
 }
@@ -482,7 +481,8 @@ func (e *Engine) PrepQueryPlanForExecution(ctx *sql.Context, _ string, plan sql.
 
 		return nil, nil, nil, err
 	}
-	iter = rowexec.AddExpressionCloser(plan, iter)
+
+	iter = finalizeIters(plan, nil, iter)
 
 	return plan.Schema(), iter, nil, nil
 }
@@ -829,7 +829,8 @@ func (e *Engine) executeEvent(ctx *sql.Context, dbName, createEventStatement, us
 		}
 		return err
 	}
-	iter = rowexec.AddExpressionCloser(definitionNode, iter)
+
+	iter = finalizeIters(definitionNode, nil, iter)
 
 	// Drain the iterate to execute the event body/definition
 	// NOTE: No row data is returned for an event; we just need to execute the statements
@@ -862,3 +863,10 @@ func findCreateEventNode(planTree sql.Node) (*plan.CreateEvent, error) {
 
 	return createEventNode, nil
 }
+
+// finalizeIters applies the final transformations on sql.RowIter before execution.
+func finalizeIters(analyzed sql.Node, qFlags *sql.QueryFlags, iter sql.RowIter) sql.RowIter {
+	iter = rowexec.AddTransactionCommittingIter(iter, qFlags)
+	iter = rowexec.AddExpressionCloser(analyzed, iter)
+	return iter
+}