From aca4a6c933c34f136408653c30595a9471372d5e Mon Sep 17 00:00:00 2001 From: Andrew Balholm Date: Fri, 10 Feb 2012 09:19:22 +1100 Subject: [PATCH] database/sql: support ErrSkip in Tx.Exec If the database driver supports the Execer interface but returns ErrSkip, calling Exec on a transaction was returning the error instead of using the slow path. R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/5654044 --- src/pkg/database/sql/sql.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pkg/database/sql/sql.go b/src/pkg/database/sql/sql.go index fe43f92b98..e7a067b893 100644 --- a/src/pkg/database/sql/sql.go +++ b/src/pkg/database/sql/sql.go @@ -523,10 +523,12 @@ func (tx *Tx) Exec(query string, args ...interface{}) (Result, error) { if execer, ok := ci.(driver.Execer); ok { resi, err := execer.Exec(query, args) - if err != nil { + if err == nil { + return result{resi}, nil + } + if err != driver.ErrSkip { return nil, err } - return result{resi}, nil } sti, err := ci.Prepare(query) -- 2.50.0