Merge pull request #358 from ydb-platform/badconn

* Refactored the xsql.badconn.Error

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Refactored the `xsql.badconn.Error`
+
 ## v3.37.0
 * Supported read-only `sql.LevelSnapshot` isolation with fake transaction and `OnlineReadOnly` transaction control (transient, while YDB clusters are not updated with true snapshot isolation mode)
 * Supported the `*sql.Conn` as input type `ydb.Unwrap` helper for go's 1.18

internal/xsql/badconn/badconn_go1.18.go

@@ -10,29 +10,38 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 )
 
-type badConnError struct {
+type Error struct {
 	err error
 }
 
-func (e badConnError) Error() string {
+func (e Error) Origin() error {
+	return e.err
+}
+
+func (e Error) Error() string {
 	return e.err.Error()
 }
 
-func (e badConnError) Is(err error) bool {
+func (e Error) Is(err error) bool {
 	//nolint:errorlint
 	if err == driver.ErrBadConn {
 		return true
 	}
 	return xerrors.Is(e.err, err)
 }
 
-func (e badConnError) As(target interface{}) bool {
-	return xerrors.As(e.err, target)
+func (e Error) As(target interface{}) bool {
+	switch target.(type) {
+	case Error, *Error:
+		return true
+	default:
+		return xerrors.As(e.err, target)
+	}
 }
 
 func Map(err error) error {
 	if retry.MustDeleteSession(err) {
-		return badConnError{err: err}
+		return Error{err: err}
 	}
 	return err
 }

retry/errors_go1.18.go

@@ -3,6 +3,15 @@
 
 package retry
 
+import (
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
+)
+
 func unwrapErrBadConn(err error) error {
+	var e *badconn.Error
+	if xerrors.As(err, &e) {
+		return e.Origin()
+	}
 	return err
 }