aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/database/sql/sql.go
diff options
context:
space:
mode:
authorMichael Lewis <mikelikespie@gmail.com>2012-04-03 15:36:48 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2012-04-03 15:36:48 -0700
commit86092b3d450da7f4075d96c4b0cb27c31500bcc8 (patch)
treef3ccc447a3c58c717e9acf6473eefc7465b84ded /src/pkg/database/sql/sql.go
parent7a33265ccdf37b7f15125f7e561e4da3a0e0ad9d (diff)
downloadgo-86092b3d450da7f4075d96c4b0cb27c31500bcc8.tar.xz
sql: Propagate error from subsetTypeArgs in Exec
Fixes #3449 R=golang-dev CC=bradfitz, golang-dev https://golang.org/cl/5970076
Diffstat (limited to 'src/pkg/database/sql/sql.go')
-rw-r--r--src/pkg/database/sql/sql.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go
index 51a357b37d..89136ef6e4 100644
--- a/src/pkg/database/sql/sql.go
+++ b/src/pkg/database/sql/sql.go
@@ -327,6 +327,9 @@ func (db *DB) prepare(query string) (stmt *Stmt, err error) {
// Exec executes a query without returning any rows.
func (db *DB) Exec(query string, args ...interface{}) (Result, error) {
sargs, err := subsetTypeArgs(args)
+ if err != nil {
+ return nil, err
+ }
var res Result
for i := 0; i < 10; i++ {
res, err = db.exec(query, sargs)