aboutsummaryrefslogtreecommitdiff
path: root/src/database/sql/sql_test.go
diff options
context:
space:
mode:
authorDaniel Theophanes <kardianos@gmail.com>2016-12-13 07:55:12 -0800
committerBrad Fitzpatrick <bradfitz@golang.org>2016-12-14 18:13:13 +0000
commitd0501f1da9c54a8053940feeb86e1644ffaae522 (patch)
tree35a699faceba0cf306bdf1a413d24828ac2e21da /src/database/sql/sql_test.go
parentfe07091f9eb9a1dcedc6eab1762de5383f520a00 (diff)
downloadgo-d0501f1da9c54a8053940feeb86e1644ffaae522.tar.xz
database/sql: do not store Tx options in Context
Drivers which previously supported tip will need to update to this revision before release. Fixes #18284 Change-Id: I70b8e7afff1558a8b5348885ce9f50e067c72ee9 Reviewed-on: https://go-review.googlesource.com/34330 Run-TryBot: Daniel Theophanes <kardianos@gmail.com> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/database/sql/sql_test.go')
-rw-r--r--src/database/sql/sql_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go
index 1ec6217858..422d2198ba 100644
--- a/src/database/sql/sql_test.go
+++ b/src/database/sql/sql_test.go
@@ -375,7 +375,7 @@ func TestTxContextWait(t *testing.T) {
ctx, _ := context.WithTimeout(context.Background(), time.Millisecond*15)
- tx, err := db.BeginContext(ctx)
+ tx, err := db.BeginTx(ctx, nil)
if err != nil {
t.Fatal(err)
}