Merge pull request #42 from qustavo/test/fix_nil_onerr

test: fix nil onError handler on testHooks

Author: qustavo

benchmark_test.go

@@ -13,7 +13,7 @@ import (
 
 func init() {
 	hooks := &testHooks{}
-	hooks.noop()
+	hooks.reset()
 
 	sql.Register("sqlite3-benchmark", Wrap(&sqlite3.SQLiteDriver{}, hooks))
 	sql.Register("mysql-benchmark", Wrap(&mysql.MySQLDriver{}, hooks))

sqlhooks_mysql_test.go

@@ -36,7 +36,7 @@ func TestMySQL(t *testing.T) {
 	s.TestErrHookHook(t, "SELECT * FROM users WHERE id = $2", "INVALID_ARGS")
 
 	t.Run("DBWorks", func(t *testing.T) {
-		s.hooks.noop()
+		s.hooks.reset()
 		if _, err := s.db.Exec("DELETE FROM users"); err != nil {
 			t.Fatal(err)
 		}

sqlhooks_postgres_test.go

@@ -36,7 +36,7 @@ func TestPostgres(t *testing.T) {
 	s.TestErrHookHook(t, "SELECT * FROM users WHERE id = $2", "INVALID_ARGS")
 
 	t.Run("DBWorks", func(t *testing.T) {
-		s.hooks.noop()
+		s.hooks.reset()
 		if _, err := s.db.Exec("DELETE FROM users"); err != nil {
 			t.Fatal(err)
 		}

sqlhooks_sqlite3_test.go

@@ -34,7 +34,7 @@ func TestSQLite3(t *testing.T) {
 	s.TestErrHookHook(t, "SELECT * FROM users WHERE id = $2", "INVALID_ARGS")
 
 	t.Run("DBWorks", func(t *testing.T) {
-		s.hooks.noop()
+		s.hooks.reset()
 		if _, err := s.db.Exec("DELETE FROM users"); err != nil {
 			t.Fatal(err)
 		}

sqlhooks_test.go

@@ -19,12 +19,22 @@ type testHooks struct {
 	onError ErrorHook
 }
 
-func (h *testHooks) noop() {
-	noop := func(ctx context.Context, query string, args ...interface{}) (context.Context, error) {
+func newTestHooks() *testHooks {
+	th := &testHooks{}
+	th.reset()
+	return th
+}
+
+func (h *testHooks) reset() {
+	noop := func(ctx context.Context, _ string, _ ...interface{}) (context.Context, error) {
 		return ctx, nil
 	}
 
-	h.before, h.after = noop, noop
+	noopErr := func(_ context.Context, err error, _ string, _ ...interface{}) error {
+		return err
+	}
+
+	h.before, h.after, h.onError = noop, noop, noopErr
 }
 
 func (h *testHooks) Before(ctx context.Context, query string, args ...interface{}) (context.Context, error) {
@@ -45,7 +55,8 @@ type suite struct {
 }
 
 func newSuite(t *testing.T, driver driver.Driver, dsn string) *suite {
-	hooks := &testHooks{}
+	hooks := newTestHooks()
+
 	driverName := fmt.Sprintf("sqlhooks-%s", time.Now().String())
 	sql.Register(driverName, Wrap(driver, hooks))