From: Daniel Theophanes <kardianos@gmail.com>
Date: Tue, 4 Oct 2016 16:21:30 +0000 (-0700)
Subject: database/sql: fixup remaining driver call to use context
X-Git-Tag: go1.8beta1~1047
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fa49c3970a43ca77d46363397e7f4f3ae1f5957c;p=gostls13.git

database/sql: fixup remaining driver call to use context

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>
---

diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index f56c71a638..c26d7d3063 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -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