Skip to content

Commit 16088f3

Browse files
committed
NO-ISSUE Update tests
1 parent bd88416 commit 16088f3

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

errors.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package mssqlx
22

33
import (
4+
"database/sql"
45
"database/sql/driver"
56
"fmt"
67
"os"
@@ -13,7 +14,7 @@ import (
1314
// check bad connection
1415
func isErrBadConn(err error) bool {
1516
if err != nil {
16-
if err == driver.ErrBadConn || err == mysql.ErrInvalidConn {
17+
if err == driver.ErrBadConn || err == sql.ErrConnDone || err == mysql.ErrInvalidConn {
1718
return true
1819
}
1920

retry.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ func retryFunc(query string, f func() (interface{}, error)) (result interface{},
1212
}
1313

1414
switch err {
15-
case sql.ErrConnDone:
16-
1715
case sql.ErrTxDone, sql.ErrNoRows:
1816
return
1917

@@ -26,7 +24,7 @@ func retryFunc(query string, f func() (interface{}, error)) (result interface{},
2624
}
2725
}
2826

29-
if err == sql.ErrConnDone || isErrBadConn(err) {
27+
if isErrBadConn(err) {
3028
reportError(query, err)
3129
}
3230

retry_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package mssqlx
2+
3+
import (
4+
"database/sql"
5+
"testing"
6+
7+
"github.com/stretchr/testify/require"
8+
)
9+
10+
func TestRetry(t *testing.T) {
11+
_, err := retryFunc("", func() (interface{}, error) {
12+
return nil, sql.ErrConnDone
13+
})
14+
require.Equal(t, sql.ErrConnDone, err)
15+
}

0 commit comments

Comments
 (0)