diff options
| author | Blake Mizerany <blake.mizerany@gmail.com> | 2012-01-25 17:49:30 -0800 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2012-01-25 17:49:30 -0800 |
| commit | bcb976c5b277b30dab6e771659c01bddec8c8a72 (patch) | |
| tree | 5bc2b4460cd5c5b3ae534cee65d8373403e57d25 /src/pkg/database/sql/sql.go | |
| parent | 5c04272ff33d90f2417c1db40be8675dd74fdad9 (diff) | |
| download | go-bcb976c5b277b30dab6e771659c01bddec8c8a72.tar.xz | |
database/sql: fix Tx.Query
Fixes #2784
R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5574073
Diffstat (limited to 'src/pkg/database/sql/sql.go')
| -rw-r--r-- | src/pkg/database/sql/sql.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go index 70499b9a95..7e226b17dc 100644 --- a/src/pkg/database/sql/sql.go +++ b/src/pkg/database/sql/sql.go @@ -556,8 +556,11 @@ func (tx *Tx) Query(query string, args ...interface{}) (*Rows, error) { if err != nil { return nil, err } - defer stmt.Close() - return stmt.Query(args...) + rows, err := stmt.Query(args...) + if err == nil { + rows.closeStmt = stmt + } + return rows, err } // QueryRow executes a query that is expected to return at most one row. |