From 70fbcb24e5686e333c3c253df1722bd6948cf08f Mon Sep 17 00:00:00 2001 From: Ariel Mashraki Date: Thu, 17 Dec 2020 15:59:49 +0200 Subject: [PATCH] Revert "dialect: add alwaysfail driver (#1053)" This reverts commit b3e118d301fe57c871aa8e0d17c90f7127711adf. --- dialect/dialect.go | 22 ---------------------- dialect/dialect_test.go | 30 ------------------------------ 2 files changed, 52 deletions(-) delete mode 100644 dialect/dialect_test.go diff --git a/dialect/dialect.go b/dialect/dialect.go index 76a49d7f8..5bd6afa56 100644 --- a/dialect/dialect.go +++ b/dialect/dialect.go @@ -140,25 +140,3 @@ func (d *DebugTx) Rollback() error { d.log(d.ctx, fmt.Sprintf("Tx(%s): rollbacked", d.id)) return d.Tx.Rollback() } - -type errDriver struct { - Driver - err error -} - -func (d errDriver) Exec(context.Context, string, interface{}, interface{}) error { - return d.err -} - -func (d errDriver) Query(context.Context, string, interface{}, interface{}) error { - return d.err -} - -func (d errDriver) Tx(context.Context) (Tx, error) { - return nil, d.err -} - -// AlwaysFail returns a driver that always returns the given error. -func AlwaysFail(driver Driver, err error) Driver { - return errDriver{driver, err} -} diff --git a/dialect/dialect_test.go b/dialect/dialect_test.go deleted file mode 100644 index 1da303c9f..000000000 --- a/dialect/dialect_test.go +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2019-present Facebook Inc. All rights reserved. -// This source code is licensed under the Apache 2.0 license found -// in the LICENSE file in the root directory of this source tree. - -package dialect_test - -import ( - "context" - "fmt" - "testing" - - "github.com/facebook/ent/dialect" - - "github.com/stretchr/testify/require" -) - -type driver struct { - dialect.Driver -} - -func (driver) Dialect() string { return "driver" } - -func TestAlwaysFail(t *testing.T) { - d := driver{} - fd := dialect.AlwaysFail(d, fmt.Errorf("error")) - _, err := fd.Tx(context.Background()) - require.Error(t, err) - require.EqualError(t, err, "error") - require.Equal(t, d.Dialect(), fd.Dialect()) -}