From 391d117c47d39429a3cbc9f73aa4e2c3f1d66fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net> Date: Fri, 16 Dec 2016 20:49:35 +0000 Subject: [PATCH] Fix ql --- ql/database.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ql/database.go b/ql/database.go index dd41ed68..a71b951a 100644 --- a/ql/database.go +++ b/ql/database.go @@ -22,6 +22,7 @@ package ql import ( + "context" "database/sql" "errors" "sync" @@ -243,17 +244,17 @@ func (d *database) Err(err error) error { } // StatementExec wraps the statement to execute around a transaction. -func (d *database) StatementExec(query string, args ...interface{}) (res sql.Result, err error) { +func (d *database) StatementExec(ctx context.Context, query string, args ...interface{}) (res sql.Result, err error) { if d.Transaction() != nil { - return d.Driver().(*sql.Tx).Exec(query, args...) + return d.Driver().(*sql.Tx).ExecContext(ctx, query, args...) } - sqlTx, err := d.Session().Begin() + sqlTx, err := d.Session().BeginTx(ctx, nil) if err != nil { return nil, err } - if res, err = sqlTx.Exec(query, args...); err != nil { + if res, err = sqlTx.ExecContext(ctx, query, args...); err != nil { return nil, err } -- GitLab