remove error

Author: James Cor

engine.go

@@ -447,7 +447,7 @@ func (e *Engine) QueryWithBindings(ctx *sql.Context, query string, parsed sqlpar
 	}
 
 	var schema sql.Schema
-	iter, schema, err = finalizeIters(ctx, analyzed, qFlags, iter)
+	iter, schema = finalizeIters(ctx, analyzed, qFlags, iter)
 	if err != nil {
 		clearAutocommitErr := clearAutocommitTransaction(ctx)
 		if clearAutocommitErr != nil {
@@ -493,7 +493,7 @@ func (e *Engine) PrepQueryPlanForExecution(ctx *sql.Context, _ string, plan sql.
 	}
 
 	var schema sql.Schema
-	iter, schema, err = finalizeIters(ctx, plan, qFlags, iter)
+	iter, schema = finalizeIters(ctx, plan, qFlags, iter)
 	if err != nil {
 		clearAutocommitErr := clearAutocommitTransaction(ctx)
 		if clearAutocommitErr != nil {
@@ -852,14 +852,7 @@ func (e *Engine) executeEvent(ctx *sql.Context, dbName, createEventStatement, us
 		return err
 	}
 
-	iter, _, err = finalizeIters(ctx, definitionNode, nil, iter)
-	if err != nil {
-		clearAutocommitErr := clearAutocommitTransaction(ctx)
-		if clearAutocommitErr != nil {
-			return clearAutocommitErr
-		}
-		return err
-	}
+	iter, _ = finalizeIters(ctx, 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
@@ -894,17 +887,12 @@ func findCreateEventNode(planTree sql.Node) (*plan.CreateEvent, error) {
 }
 
 // finalizeIters applies the final transformations on sql.RowIter before execution.
-func finalizeIters(ctx *sql.Context, analyzed sql.Node, qFlags *sql.QueryFlags, iter sql.RowIter) (sql.RowIter, sql.Schema, error) {
-	var err error
+func finalizeIters(ctx *sql.Context, analyzed sql.Node, qFlags *sql.QueryFlags, iter sql.RowIter) (sql.RowIter, sql.Schema) {
 	var sch sql.Schema
-	// TODO: if this is does something we need to overwrite the schema with types.OkResultSchema
-	iter, sch, err = rowexec.AddAccumulatorIter(ctx, iter)
-	if err != nil {
-		return nil, nil, err
-	}
+	iter, sch = rowexec.AddAccumulatorIter(ctx, iter)
 	iter = rowexec.AddTriggerRollbackIter(ctx, qFlags, iter)
 	iter = rowexec.AddTransactionCommittingIter(qFlags, iter)
 	iter = plan.AddTrackedRowIter(ctx, analyzed, iter)
 	iter = rowexec.AddExpressionCloser(analyzed, iter)
-	return iter, sch, nil
+	return iter, sch
 }

engine_test.go

@@ -232,7 +232,7 @@ func TestTrackProcess(t *testing.T) {
 
 	iter, err := rowexec.DefaultBuilder.Build(ctx, result, nil)
 	require.NoError(err)
-	iter, _, err = finalizeIters(ctx, result, nil, iter)
+	iter, _ = finalizeIters(ctx, result, nil, iter)
 	require.NoError(err)
 	_, err = sql.RowIterToRows(ctx, iter)
 	require.NoError(err)

sql/rowexec/dml_iters.go

@@ -563,26 +563,26 @@ func getRowHandler(clientFoundRowsToggled bool, iter sql.RowIter) accumulatorRow
 	}
 }
 
-func AddAccumulatorIter(ctx *sql.Context, iter sql.RowIter) (sql.RowIter, sql.Schema, error) {
+func AddAccumulatorIter(ctx *sql.Context, iter sql.RowIter) (sql.RowIter, sql.Schema) {
 	switch i := iter.(type) {
 	case *callIter:
-		childIter, sch, err := AddAccumulatorIter(ctx, i.innerIter)
+		childIter, sch := AddAccumulatorIter(ctx, i.innerIter)
 		i.innerIter = childIter
-		return i, sch, err
+		return i, sch
 	case *beginEndIter:
-		childIter, sch, err := AddAccumulatorIter(ctx, i.rowIter)
+		childIter, sch := AddAccumulatorIter(ctx, i.rowIter)
 		i.rowIter = childIter
-		return i, sch, err
+		return i, sch
 	default:
 		clientFoundRowsToggled := (ctx.Client().Capabilities & mysql.CapabilityClientFoundRows) > 0
 		rowHandler := getRowHandler(clientFoundRowsToggled, iter)
 		if rowHandler == nil {
-			return iter, nil, nil
+			return iter, nil
 		}
 		return &accumulatorIter{
 			iter:             iter,
 			updateRowHandler: rowHandler,
-		}, types.OkResultSchema, nil
+		}, types.OkResultSchema
 	}
 }