From bd08803680792b553dc78d5b5006ebedadaaccf0 Mon Sep 17 00:00:00 2001 From: Matt Dee Date: Tue, 8 Aug 2017 15:58:27 -0400 Subject: database/sql: fail on unsupported options when context is un-cancellable Currently, the check for `ctx.Done() == context.Background().Done()` comes before the check to see if we are ignoring any options. That check should be done earlier, so that the options are not silently ignored. Fixes #21350 Change-Id: I3704e4209854c7d99f3f92498bae831cabc7e419 Reviewed-on: https://go-review.googlesource.com/53970 Reviewed-by: Daniel Theophanes Run-TryBot: Daniel Theophanes TryBot-Result: Gobot Gobot --- src/database/sql/ctxutil.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/database/sql/ctxutil.go') diff --git a/src/database/sql/ctxutil.go b/src/database/sql/ctxutil.go index bd652b5462..b73ee86594 100644 --- a/src/database/sql/ctxutil.go +++ b/src/database/sql/ctxutil.go @@ -107,10 +107,6 @@ func ctxDriverBegin(ctx context.Context, opts *TxOptions, ci driver.Conn) (drive return ciCtx.BeginTx(ctx, dopts) } - if ctx.Done() == context.Background().Done() { - return ci.Begin() - } - if opts != nil { // Check the transaction level. If the transaction level is non-default // then return an error here as the BeginTx driver value is not supported. @@ -125,6 +121,10 @@ func ctxDriverBegin(ctx context.Context, opts *TxOptions, ci driver.Conn) (drive } } + if ctx.Done() == context.Background().Done() { + return ci.Begin() + } + txi, err := ci.Begin() if err == nil { select { -- cgit v1.3-5-g9baa