From bcb976c5b277b30dab6e771659c01bddec8c8a72 Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Wed, 25 Jan 2012 17:49:30 -0800 Subject: database/sql: fix Tx.Query Fixes #2784 R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/5574073 --- src/pkg/database/sql/sql.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/pkg/database/sql/sql.go') 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. -- cgit v1.3