tidying up

Author: James Cor

engine.go

@@ -898,7 +898,7 @@ func finalizeIters(ctx *sql.Context, analyzed sql.Node, qFlags *sql.QueryFlags,
 	var err error
 	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, analyzed, iter)
+	iter, sch, err = rowexec.AddAccumulatorIter(ctx, iter)
 	if err != nil {
 		return nil, nil, err
 	}

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, _, err = finalizeIters(ctx, result, nil, iter)
 	require.NoError(err)
 	_, err = sql.RowIterToRows(ctx, iter)
 	require.NoError(err)

sql/rowexec/dml_iters.go

@@ -563,14 +563,14 @@ func getRowHandler(clientFoundRowsToggled bool, iter sql.RowIter) accumulatorRow
 	}
 }
 
-func AddAccumulatorIter(ctx *sql.Context, node sql.Node, iter sql.RowIter) (sql.RowIter, sql.Schema, error) {
+func AddAccumulatorIter(ctx *sql.Context, iter sql.RowIter) (sql.RowIter, sql.Schema, error) {
 	switch i := iter.(type) {
 	case *callIter:
-		childIter, sch, err := AddAccumulatorIter(ctx, node, i.innerIter)
+		childIter, sch, err := AddAccumulatorIter(ctx, i.innerIter)
 		i.innerIter = childIter
 		return i, sch, err
 	case *beginEndIter:
-		childIter, sch, err := AddAccumulatorIter(ctx, node, i.rowIter)
+		childIter, sch, err := AddAccumulatorIter(ctx, i.rowIter)
 		i.rowIter = childIter
 		return i, sch, err
 	default:

sql/rowexec/other.go

@@ -223,7 +223,6 @@ func (b *BaseBuilder) buildBlock(ctx *sql.Context, n *plan.Block, row sql.Row) (
 				returnNode = subIterNode
 				returnIter = subIter
 				returnSch  = types.OkResultSchema
-				//returnSch = subIterSch
 			}
 
 			for {