Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

database/sql: fixup remaining driver call to use context

Browse source 
Missed one in the prior CL.

Change-Id: I6f6d84d52fe4d902a985971a402701fb3b1eed86
Reviewed-on: https://go-review.googlesource.com/30255
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Daniel Theophanes 2016-10-04 09:21:30 -07:00 • committed by Brad Fitzpatrick
parent ddb77100a6
commit fa49c3970a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/database/sql/sql.go
View file

@ -1499,7 +1499,7 @@ func (tx *Tx) ExecContext(ctx context.Context, query string, args ...interface{}
} }
var resi driver.Result var resi driver.Result
withLock(dc, func() { withLock(dc, func() {
resi, err = execer.Exec(query, dargs) resi, err = ctxDriverExec(ctx, execer, query, dargs)
}) })
if err == nil { if err == nil {
return driverResult{dc, resi}, nil return driverResult{dc, resi}, nil
@ -1511,7 +1511,7 @@ func (tx *Tx) ExecContext(ctx context.Context, query string, args ...interface{}
var si driver.Stmt var si driver.Stmt
withLock(dc, func() { withLock(dc, func() {
si, err = dc.ci.Prepare(query) si, err = ctxDriverPrepare(ctx, dc.ci, query)
}) })
if err != nil { if err != nil {
return nil, err return nil, err