qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 11:04:56 -07:00
Code Releases Activity

database/sql: check NumInput on Stmt.Exec

Browse Source 
Fixes #3678.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6460087
This commit is contained in:
Gwenael Treguier 2013-01-11 13:28:33 -08:00 committed by Brad Fitzpatrick
parent ab1385ec95
commit 7f0449a108
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pkg/database/sql/sql.go
View File

@ -369,16 +369,7 @@ func (db *DB) exec(query string, args []interface{}) (res Result, err error) {
}
defer sti.Close()
dargs, err := driverArgs(sti, args)
if err != nil {
return nil, err
}
resi, err := sti.Exec(dargs)
if err != nil {
return nil, err
}
return result{resi}, nil
return resultFromStatement(sti, args...)
}
// Query executes a query that returns rows, typically a SELECT.
@ -608,16 +599,7 @@ func (tx *Tx) Exec(query string, args ...interface{}) (Result, error) {
}
defer sti.Close()
dargs, err := driverArgs(sti, args)
if err != nil {
return nil, err
}
resi, err := sti.Exec(dargs)
if err != nil {
return nil, err
}
return result{resi}, nil
return resultFromStatement(sti, args...)
}
// Query executes a query that returns rows, typically a SELECT.
@ -682,6 +664,10 @@ func (s *Stmt) Exec(args ...interface{}) (Result, error) {
}
defer releaseConn(nil)
return resultFromStatement(si, args...)
}
func resultFromStatement(si driver.Stmt, args ...interface{}) (Result, error) {
// -1 means the driver doesn't know how to count the number of
// placeholders, so we won't sanity check input here and instead let the
// driver deal with errors.