From 721ae9b9247a47d057685a82ea630300f638ca04 Mon Sep 17 00:00:00 2001 From: Jamie Cuthill Date: Fri, 26 Feb 2016 11:37:24 +0000 Subject: [PATCH] Move expectation triggered below error cases. - Issue https://github.com/DATA-DOG/go-sqlmock/issues/37 --- sqlmock.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqlmock.go b/sqlmock.go index e82944b..e6129c4 100644 --- a/sqlmock.go +++ b/sqlmock.go @@ -231,7 +231,6 @@ func (c *sqlmock) Exec(query string, args []driver.Value) (res driver.Result, er } defer expected.Unlock() - expected.triggered = true if !expected.queryMatches(query) { return nil, fmt.Errorf("exec query '%s', does not match regex '%s'", query, expected.sqlRegex.String()) @@ -248,6 +247,7 @@ func (c *sqlmock) Exec(query string, args []driver.Value) (res driver.Result, er if expected.result == nil { return nil, fmt.Errorf("exec query '%s' with args %+v, must return a database/sql/driver.result, but it was not set for expectation %T as %+v", query, args, expected, expected) } + expected.triggered = true return expected.result, err }