[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

»»»

diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go
index 51a357b37debbc2cd6cefe176a6472686699a5c8..89136ef6e40f1cc473ddabbbc0a91976e5b9b153 100644 (file)
--- 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)