aboutsummaryrefslogtreecommitdiff
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
commitca246227a8d4123f4b66e0b6ae91ebdc37114343 (patch)
tree6a5bf6280a5ef83fefcfaa712c346593babf8a99
parent02c38a83b9a68d4c3e90c18415c99e5f5b36dc94 (diff)
downloadgo-ca246227a8d4123f4b66e0b6ae91ebdc37114343.tar.gz
go-ca246227a8d4123f4b66e0b6ae91ebdc37114343.zip
[release-branch.go1] sql: Propagate error from subsetTypeArgs in Exec
««« backport dd8f13acda2e sql: Propagate error from subsetTypeArgs in Exec Fixes #3449 R=golang-dev CC=bradfitz, golang-dev https://golang.org/cl/5970076 »»»
-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)