fix error AlreadyHaveTxError

Author: asmyasnikov

internal/table/conn/conn.go

@@ -310,7 +310,7 @@ func (c *Conn) queryContext(ctx context.Context, query string, args []driver.Nam
 	case ScriptingQueryMode:
 		return c.execScriptingQuery(ctx, normalizedQuery, parameters)
 	default:
-		return nil, fmt.Errorf("unsupported query mode '%s' on Conn query", queryMode)
+		return nil, fmt.Errorf("unsupported query mode '%s' on conn query", queryMode)
 	}
 }
 
@@ -451,11 +451,7 @@ func (c *Conn) ID() string {
 func (c *Conn) beginTx(ctx context.Context, txOptions driver.TxOptions) (currentTx, error) {
 	if c.currentTx != nil {
 		return nil, badconn.Map(
-			xerrors.WithStackTrace(
-				fmt.Errorf("broken Conn state: Conn=%q already have current tx=%q",
-					c.ID(), c.currentTx.ID(),
-				),
-			),
+			xerrors.WithStackTrace(xerrors.AlreadyHasTx(c.currentTx.ID())),
 		)
 	}
 

internal/table/conn/errors.go

@@ -10,25 +10,6 @@ import (
 var (
 	ErrUnsupported     = driver.ErrSkip
 	errDeprecated      = driver.ErrSkip
-	errConnClosedEarly = xerrors.Retryable(errors.New("Conn closed early"), xerrors.InvalidObject())
-	errNotReadyConn    = xerrors.Retryable(errors.New("Conn not ready"), xerrors.InvalidObject())
+	errConnClosedEarly = xerrors.Retryable(errors.New("conn closed early"), xerrors.InvalidObject())
+	errNotReadyConn    = xerrors.Retryable(errors.New("conn not ready"), xerrors.InvalidObject())
 )
-
-type AlreadyHaveTxError struct {
-	currentTx string
-}
-
-func (err *AlreadyHaveTxError) Error() string {
-	return "Conn already have an open currentTx: " + err.currentTx
-}
-
-func (err *AlreadyHaveTxError) As(target interface{}) bool {
-	switch t := target.(type) {
-	case *AlreadyHaveTxError:
-		t.currentTx = err.currentTx
-
-		return true
-	default:
-		return false
-	}
-}

internal/table/conn/tx.go

@@ -52,12 +52,12 @@ func (tx *transaction) checkTxState() error {
 		return nil
 	}
 	if tx.conn.currentTx == nil {
-		return fmt.Errorf("broken Conn state: tx=%q not related to Conn=%q",
+		return fmt.Errorf("broken conn state: tx=%q not related to conn=%q",
 			tx.ID(), tx.conn.ID(),
 		)
 	}
 
-	return fmt.Errorf("broken Conn state: tx=%s not related to Conn=%q (Conn have current tx=%q)",
+	return fmt.Errorf("broken conn state: tx=%s not related to conn=%q (conn have current tx=%q)",
 		tx.conn.currentTx.ID(), tx.conn.ID(), tx.ID(),
 	)
 }

internal/xerrors/tx.go

@@ -0,0 +1,29 @@
+package xerrors
+
+type alreadyHasTxError struct {
+	currentTx string
+}
+
+func (err *alreadyHasTxError) Error() string {
+	return "сonn already has an open currentTx: " + err.currentTx
+}
+
+func (err *alreadyHasTxError) As(target interface{}) bool {
+	switch t := target.(type) {
+	case *alreadyHasTxError:
+		t.currentTx = err.currentTx
+
+		return true
+	default:
+		return false
+	}
+}
+
+func AlreadyHasTx(txID string) error {
+	return &alreadyHasTxError{currentTx: txID}
+}
+
+func IsAlreadyHasTx(err error) bool {
+	var txErr *alreadyHasTxError
+	return As(err, &txErr)
+}

tests/integration/tx_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3"
-	tableSql "github.com/ydb-platform/ydb-go-sdk/v3/internal/table/conn"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/result/indexed"
@@ -137,15 +137,12 @@ func TestNoEffectsIfForgetCommitTx(t *testing.T) {
 		require.NoError(t, err)
 
 		// check row for NO write
-		var (
-			value                  string
-			connAlreadyHaveTxError *tableSql.AlreadyHaveTxError
-		)
+		var value string
 		err = db.QueryRowContext(ctx, `SELECT val FROM table WHERE id = $1`, id).Scan(&value)
 		require.ErrorIs(t, err, sql.ErrNoRows)
 
 		// second tx on existing conn === session
 		_, err = cc.BeginTx(ctx, &sql.TxOptions{})
-		require.ErrorAs(t, err, &connAlreadyHaveTxError)
+		require.True(t, xerrors.IsAlreadyHasTx(err))
 	})
 }