GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update stdlib for latest pgconn

pull/594/head
Jack Christensen 2019-08-27 18:29:27 -05:00
parent ddd9cf451e
commit 28d5375b74
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stdlib/sql.go
View File

@ -75,7 +75,6 @@ import (
"fmt"
"io"
"math"
"net"
"reflect"
"strings"
"sync"
@ -227,8 +226,7 @@ func (c *Conn) ExecContext(ctx context.Context, query string, argsV []driver.Nam
commandTag, err := c.conn.Exec(ctx, query, args...)
// if we got a network error before we had a chance to send the query, retry
if err != nil {
var netErr net.Error
if is := errors.As(err, &netErr); is && errors.Is(err, pgconn.ErrNoBytesSent) {
if pgconn.SafeToRetry(err) {
return nil, driver.ErrBadConn
}
}
@ -245,7 +243,7 @@ func (c *Conn) QueryContext(ctx context.Context, query string, argsV []driver.Na
rows, err := c.conn.Query(ctx, query, args...)
if err != nil {
if errors.Is(err, pgconn.ErrNoBytesSent) {
if pgconn.SafeToRetry(err) {
return nil, driver.ErrBadConn
}
return nil, err

4
stdlib/sql_test.go
View File

@ -895,8 +895,8 @@ func TestStmtExecContextCancel(t *testing.T) {
defer cancel()
_, err = stmt.ExecContext(ctx, 42)
if err != context.DeadlineExceeded {
t.Errorf("err => %v, want %v", err, context.DeadlineExceeded)
if !pgconn.Timeout(err) {
t.Errorf("expected timeout error, got %v", err)
}
ensureConnValid(t, db)