From 3d28ad47188f97e96c92a8432f783f0ac969342a Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Tue, 3 Apr 2018 15:21:07 +0200 Subject: [PATCH] Do not panic if Begin().Error was ignored --- main.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index c26e05c8..ffee4ec6 100644 --- a/main.go +++ b/main.go @@ -491,7 +491,8 @@ func (s *DB) Begin() *DB { // Commit commit a transaction func (s *DB) Commit() *DB { - if db, ok := s.db.(sqlTx); ok && db != nil { + var emptySQLTx *sql.Tx + if db, ok := s.db.(sqlTx); ok && db != nil && db != emptySQLTx { s.AddError(db.Commit()) } else { s.AddError(ErrInvalidTransaction)