Skip to content

Commit b9d200a

Browse files
author
James Cor
committed
qFlags
1 parent 473f514 commit b9d200a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

engine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ func (e *Engine) QueryWithBindings(ctx *sql.Context, query string, parsed sqlpar
454454

455455
// PrepQueryPlanForExecution prepares a query plan for execution and returns the result schema with a row iterator to
456456
// begin spooling results
457-
func (e *Engine) PrepQueryPlanForExecution(ctx *sql.Context, _ string, plan sql.Node) (sql.Schema, sql.RowIter, *sql.QueryFlags, error) {
457+
func (e *Engine) PrepQueryPlanForExecution(ctx *sql.Context, _ string, plan sql.Node, qFlags *sql.QueryFlags) (sql.Schema, sql.RowIter, *sql.QueryFlags, error) {
458458
// Give the integrator a chance to reject the session before proceeding
459459
// TODO: this check doesn't belong here
460460
err := ctx.Session.ValidateSession(ctx)
@@ -482,9 +482,9 @@ func (e *Engine) PrepQueryPlanForExecution(ctx *sql.Context, _ string, plan sql.
482482
return nil, nil, nil, err
483483
}
484484

485-
iter = finalizeIters(ctx, plan, nil, iter)
485+
iter = finalizeIters(ctx, plan, qFlags, iter)
486486

487-
return plan.Schema(), iter, nil, nil
487+
return plan.Schema(), iter, qFlags, nil
488488
}
489489

490490
// BoundQueryPlan returns query plan for the given statement with the given bindings applied

server/handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,9 +1084,9 @@ func (h *Handler) executeBoundPlan(
10841084
_ sqlparser.Statement,
10851085
plan sql.Node,
10861086
_ map[string]*querypb.BindVariable,
1087-
_ *sql.QueryFlags,
1087+
qFlags *sql.QueryFlags,
10881088
) (sql.Schema, sql.RowIter, *sql.QueryFlags, error) {
1089-
return h.e.PrepQueryPlanForExecution(ctx, query, plan)
1089+
return h.e.PrepQueryPlanForExecution(ctx, query, plan, qFlags)
10901090
}
10911091

10921092
func bindingsToExprs(bindings map[string]*querypb.BindVariable) (map[string]sqlparser.Expr, error) {

0 commit comments

Comments
 (0)