]> Cypherpunks repositories - gostls13.git/commitdiff
database/sql: fixup remaining driver call to use context
authorDaniel Theophanes <kardianos@gmail.com>
Tue, 4 Oct 2016 16:21:30 +0000 (09:21 -0700)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 4 Oct 2016 17:22:14 +0000 (17:22 +0000)
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>

src/database/sql/sql.go

index f56c71a638bfac10b277bec0a5b71cba0ad81f14..c26d7d30634ea5f702ddb44184c2362e4741f3f4 100644 (file)
@@ -1499,7 +1499,7 @@ func (tx *Tx) ExecContext(ctx context.Context, query string, args ...interface{}
                }
                var resi driver.Result
                withLock(dc, func() {
-                       resi, err = execer.Exec(query, dargs)
+                       resi, err = ctxDriverExec(ctx, execer, query, dargs)
                })
                if err == 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
        withLock(dc, func() {
-               si, err = dc.ci.Prepare(query)
+               si, err = ctxDriverPrepare(ctx, dc.ci, query)
        })
        if err != nil {
                return nil, err