fix

Author: asmyasnikov

internal/xsql/badconn/badconn.go

@@ -2,6 +2,7 @@ package badconn
 
 import (
 	"database/sql/driver"
+	"errors"
 	"fmt"
 	"io"
 
@@ -12,6 +13,10 @@ type Error struct {
 	err error
 }
 
+func New(msg string) error {
+	return &Error{err: errors.New(msg)}
+}
+
 func Errorf(format string, args ...interface{}) error {
 	return &Error{err: fmt.Errorf(format, args...)}
 }

internal/xsql/errors.go

@@ -3,11 +3,13 @@ package xsql
 import (
 	"database/sql/driver"
 	"errors"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 )
 
 var (
 	ErrUnsupported         = driver.ErrSkip
 	errDeprecated          = driver.ErrSkip
 	errWrongQueryProcessor = errors.New("wrong query processor")
-	errNotReadyConn        = errors.New("conn not ready")
+	errNotReadyConn        = badconn.New("conn not ready")
 )

internal/xsql/xquery/errors.go

@@ -2,12 +2,13 @@ package xquery
 
 import (
 	"database/sql/driver"
-	"errors"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 )
 
 var (
 	ErrUnsupported     = driver.ErrSkip
 	errDeprecated      = driver.ErrSkip
-	errConnClosedEarly = errors.New("conn closed early")
-	errNotReadyConn    = errors.New("conn not ready")
+	errConnClosedEarly = badconn.New("conn closed early")
+	errNotReadyConn    = badconn.New("conn not ready")
 )

internal/xsql/xtable/conn.go

@@ -51,7 +51,7 @@ func (c *Conn) NodeID() uint32 {
 
 func (c *Conn) Exec(ctx context.Context, sql string, params *params.Params) (result driver.Result, err error) {
 	if !c.isReady() {
-		return nil, badconn.Map(xerrors.WithStackTrace(xerrors.Retryable(errConnClosedEarly,
+		return nil, badconn.Map(xerrors.WithStackTrace(xerrors.Retryable(errNotReadyConn,
 			xerrors.Invalid(c),
 			xerrors.Invalid(c.session),
 		)))
@@ -243,7 +243,7 @@ func (c *Conn) execScriptingQuery(ctx context.Context, sql string, params *param
 
 func (c *Conn) Ping(ctx context.Context) (finalErr error) {
 	if !c.isReady() {
-		return badconn.Map(xerrors.WithStackTrace(xerrors.Retryable(errConnClosedEarly,
+		return badconn.Map(xerrors.WithStackTrace(xerrors.Retryable(errNotReadyConn,
 			xerrors.Invalid(c),
 			xerrors.Invalid(c.session),
 		)))

internal/xsql/xtable/errors.go

@@ -3,11 +3,13 @@ package xtable
 import (
 	"database/sql/driver"
 	"errors"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 )
 
 var (
 	ErrUnsupported     = driver.ErrSkip
-	errConnClosedEarly = errors.New("conn closed early")
-	errNotReadyConn    = errors.New("conn not ready")
+	errConnClosedEarly = badconn.New("conn closed early")
+	errNotReadyConn    = badconn.New("conn not ready")
 	ErrWrongQueryMode  = errors.New("wrong query mode")
 )

retry/sql.go

@@ -5,11 +5,11 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"fmt"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 	budget "github.com/ydb-platform/ydb-go-sdk/v3/retry/budget"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )

tests/integration/database_sql_regression_test.go

@@ -9,7 +9,6 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 	"math/rand"
 	"strings"
 	"testing"
@@ -22,6 +21,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"