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

PG error type is *pgconn.PgError

pull/483/head
Jack Christensen 2018-12-31 17:46:56 -06:00
parent 103ab963eb
commit 378ccb8945
14 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
batch_test.go
View File

@ -6,6 +6,7 @@ import (
"testing" "testing"
"github.com/jackc/pgx" "github.com/jackc/pgx"
"github.com/jackc/pgx/pgconn"
"github.com/jackc/pgx/pgtype" "github.com/jackc/pgx/pgtype"
) )
@ -430,12 +431,12 @@ func TestConnBeginBatchQueryError(t *testing.T) {
} }
} }
if pgErr, ok := rows.Err().(pgx.PgError); !(ok && pgErr.Code == "22012") { if pgErr, ok := rows.Err().(*pgconn.PgError); !(ok && pgErr.Code == "22012") {
t.Errorf("rows.Err() => %v, want error code %v", rows.Err(), 22012) t.Errorf("rows.Err() => %v, want error code %v", rows.Err(), 22012)
} }
err = batch.Close() err = batch.Close()
if pgErr, ok := err.(pgx.PgError); !(ok && pgErr.Code == "22012") { if pgErr, ok := err.(*pgconn.PgError); !(ok && pgErr.Code == "22012") {
t.Errorf("rows.Err() => %v, want error code %v", err, 22012) t.Errorf("rows.Err() => %v, want error code %v", err, 22012)
} }
@ -464,7 +465,7 @@ func TestConnBeginBatchQuerySyntaxError(t *testing.T) {
var n int32 var n int32
err = batch.QueryRowResults().Scan(&n) err = batch.QueryRowResults().Scan(&n)
if pgErr, ok := err.(pgx.PgError); !(ok && pgErr.Code == "42601") { if pgErr, ok := err.(*pgconn.PgError); !(ok && pgErr.Code == "42601") {
t.Errorf("rows.Err() => %v, want error code %v", err, 42601) t.Errorf("rows.Err() => %v, want error code %v", err, 42601)
} }

6
conn.go
View File

@ -449,7 +449,7 @@ func (c *Conn) crateDBTypesQuery(err error) (*pgtype.ConnInfo, error) {
// [2] https://github.com/crate/crate/issues/5027 // [2] https://github.com/crate/crate/issues/5027
// [3] https://github.com/jackc/pgx/issues/320 // [3] https://github.com/jackc/pgx/issues/320
if pgErr, ok := err.(PgError); ok && if pgErr, ok := err.(*pgconn.PgError); ok &&
(pgErr.Code == "XX000" || (pgErr.Code == "XX000" ||
strings.Contains(pgErr.Message, "TableUnknownException") || strings.Contains(pgErr.Message, "TableUnknownException") ||
strings.Contains(pgErr.Message, "ColumnUnknownException")) { strings.Contains(pgErr.Message, "ColumnUnknownException")) {
@ -922,8 +922,8 @@ func hexMD5(s string) string {
return hex.EncodeToString(hash.Sum(nil)) return hex.EncodeToString(hash.Sum(nil))
} }
func (c *Conn) rxErrorResponse(msg *pgproto3.ErrorResponse) PgError { func (c *Conn) rxErrorResponse(msg *pgproto3.ErrorResponse) *pgconn.PgError {
err := PgError{ err := &pgconn.PgError{
Severity: msg.Severity, Severity: msg.Severity,
Code: msg.Code, Code: msg.Code,
Message: msg.Message, Message: msg.Message,

5
conn_pool_test.go
View File

@ -12,6 +12,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/jackc/pgx" "github.com/jackc/pgx"
"github.com/jackc/pgx/pgconn"
) )
func createConnPool(t *testing.T, maxConnections int) *pgx.ConnPool { func createConnPool(t *testing.T, maxConnections int) *pgx.ConnPool {
@ -892,7 +893,7 @@ func TestConnPoolPrepare(t *testing.T) {
} }
err = pool.QueryRow("test", "hello").Scan(&s) err = pool.QueryRow("test", "hello").Scan(&s)
if err, ok := err.(pgx.PgError); !(ok && err.Code == "42601") { if err, ok := err.(*pgconn.PgError); !(ok && err.Code == "42601") {
t.Errorf("Expected error calling deallocated prepared statement, but got: %v", err) t.Errorf("Expected error calling deallocated prepared statement, but got: %v", err)
} }
} }
@ -996,7 +997,7 @@ func TestConnPoolPrepareWhenConnIsAlreadyAcquired(t *testing.T) {
var s string var s string
err = pool.QueryRow("test", "hello").Scan(&s) err = pool.QueryRow("test", "hello").Scan(&s)
if err, ok := err.(pgx.PgError); !(ok && err.Code == "42601") { if err, ok := err.(*pgconn.PgError); !(ok && err.Code == "42601") {
t.Errorf("Expected error calling deallocated prepared statement, but got: %v", err) t.Errorf("Expected error calling deallocated prepared statement, but got: %v", err)
} }
} }

3
conn_test.go
View File

@ -11,6 +11,7 @@ import (
"time" "time"
"github.com/jackc/pgx" "github.com/jackc/pgx"
"github.com/jackc/pgx/pgconn"
"github.com/jackc/pgx/pgtype" "github.com/jackc/pgx/pgtype"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -874,7 +875,7 @@ func TestFatalRxError(t *testing.T) {
var s string var s string
err := conn.QueryRow("select 1::int4, pg_sleep(10)::varchar").Scan(&n, &s) err := conn.QueryRow("select 1::int4, pg_sleep(10)::varchar").Scan(&n, &s)
if err == pgx.ErrDeadConn { if err == pgx.ErrDeadConn {
} else if pgErr, ok := err.(pgx.PgError); ok && pgErr.Severity == "FATAL" { } else if pgErr, ok := err.(*pgconn.PgError); ok && pgErr.Severity == "FATAL" {
} else { } else {
t.Fatalf("Expected QueryRow Scan to return fatal PgError or ErrDeadConn, but instead received %v", err) t.Fatalf("Expected QueryRow Scan to return fatal PgError or ErrDeadConn, but instead received %v", err)
} }

11
copy_from_test.go
View File

@ -12,6 +12,7 @@ import (
"time" "time"
"github.com/jackc/pgx" "github.com/jackc/pgx"
"github.com/jackc/pgx/pgconn"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -332,7 +333,7 @@ func TestConnCopyFromFailServerSideMidway(t *testing.T) {
if err == nil { if err == nil {
t.Errorf("Expected CopyFrom return error, but it did not") t.Errorf("Expected CopyFrom return error, but it did not")
} }
if _, ok := err.(pgx.PgError); !ok { if _, ok := err.(*pgconn.PgError); !ok {
t.Errorf("Expected CopyFrom return pgx.PgError, but instead it returned: %v", err) t.Errorf("Expected CopyFrom return pgx.PgError, but instead it returned: %v", err)
} }
if copyCount != 0 { if copyCount != 0 {
@ -367,7 +368,7 @@ func TestConnCopyFromFailServerSideMidway(t *testing.T) {
if err == nil { if err == nil {
t.Errorf("Expected CopyFromReader return error, but it did not") t.Errorf("Expected CopyFromReader return error, but it did not")
} }
if _, ok := err.(pgx.PgError); !ok { if _, ok := err.(*pgconn.PgError); !ok {
t.Errorf("Expected CopyFromReader return pgx.PgError, but instead it returned: %v", err) t.Errorf("Expected CopyFromReader return pgx.PgError, but instead it returned: %v", err)
} }
copyCount = int(res.RowsAffected()) copyCount = int(res.RowsAffected())
@ -437,7 +438,7 @@ func TestConnCopyFromFailServerSideMidwayAbortsWithoutWaiting(t *testing.T) {
if err == nil { if err == nil {
t.Errorf("Expected CopyFrom return error, but it did not") t.Errorf("Expected CopyFrom return error, but it did not")
} }
if _, ok := err.(pgx.PgError); !ok { if _, ok := err.(*pgconn.PgError); !ok {
t.Errorf("Expected CopyFrom return pgx.PgError, but instead it returned: %v", err) t.Errorf("Expected CopyFrom return pgx.PgError, but instead it returned: %v", err)
} }
if copyCount != 0 { if copyCount != 0 {
@ -637,7 +638,7 @@ func TestConnCopyFromReaderQueryError(t *testing.T) {
t.Errorf("Expected CopyFromReader return error, but it did not") t.Errorf("Expected CopyFromReader return error, but it did not")
} }
if _, ok := err.(pgx.PgError); !ok { if _, ok := err.(*pgconn.PgError); !ok {
t.Errorf("Expected CopyFromReader return pgx.PgError, but instead it returned: %v", err) t.Errorf("Expected CopyFromReader return pgx.PgError, but instead it returned: %v", err)
} }
@ -662,7 +663,7 @@ func TestConnCopyFromReaderNoTableError(t *testing.T) {
t.Errorf("Expected CopyFromReader return error, but it did not") t.Errorf("Expected CopyFromReader return error, but it did not")
} }
if _, ok := err.(pgx.PgError); !ok { if _, ok := err.(*pgconn.PgError); !ok {
t.Errorf("Expected CopyFromReader return pgx.PgError, but instead it returned: %v", err) t.Errorf("Expected CopyFromReader return pgx.PgError, but instead it returned: %v", err)
} }

4
copy_to_test.go
View File

@ -5,7 +5,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/jackc/pgx" "github.com/jackc/pgx/pgconn"
) )
func TestConnCopyToWriterSmall(t *testing.T) { func TestConnCopyToWriterSmall(t *testing.T) {
@ -103,7 +103,7 @@ func TestConnCopyToWriterQueryError(t *testing.T) {
t.Errorf("Expected CopyToWriter return error, but it did not") t.Errorf("Expected CopyToWriter return error, but it did not")
} }
if _, ok := err.(pgx.PgError); !ok { if _, ok := err.(*pgconn.PgError); !ok {
t.Errorf("Expected CopyToWriter return pgx.PgError, but instead it returned: %v", err) t.Errorf("Expected CopyToWriter return pgx.PgError, but instead it returned: %v", err)
} }

5
large_objects_test.go
View File

@ -7,6 +7,7 @@ import (
"testing" "testing"
"github.com/jackc/pgx" "github.com/jackc/pgx"
"github.com/jackc/pgx/pgconn"
) )
func TestLargeObjects(t *testing.T) { func TestLargeObjects(t *testing.T) {
@ -117,7 +118,7 @@ func TestLargeObjects(t *testing.T) {
} }
_, err = lo.Open(id, pgx.LargeObjectModeRead) _, err = lo.Open(id, pgx.LargeObjectModeRead)
if e, ok := err.(pgx.PgError); !ok || e.Code != "42704" { if e, ok := err.(*pgconn.PgError); !ok || e.Code != "42704" {
t.Errorf("Expected undefined_object error (42704), got %#v", err) t.Errorf("Expected undefined_object error (42704), got %#v", err)
} }
} }
@ -261,7 +262,7 @@ func TestLargeObjectsMultipleTransactions(t *testing.T) {
} }
_, err = lo2.Open(id, pgx.LargeObjectModeRead) _, err = lo2.Open(id, pgx.LargeObjectModeRead)
if e, ok := err.(pgx.PgError); !ok || e.Code != "42704" { if e, ok := err.(*pgconn.PgError); !ok || e.Code != "42704" {
t.Errorf("Expected undefined_object error (42704), got %#v", err) t.Errorf("Expected undefined_object error (42704), got %#v", err)
} }
} }

4
messages.go
View File

@ -79,11 +79,9 @@ func (fd FieldDescription) Type() reflect.Type {
} }
} }
type PgError = pgconn.PgError
// Notice represents a notice response message reported by the PostgreSQL // Notice represents a notice response message reported by the PostgreSQL
// server. Be aware that this is distinct from LISTEN/NOTIFY notification. // server. Be aware that this is distinct from LISTEN/NOTIFY notification.
type Notice PgError type Notice pgconn.PgError
// appendParse appends a PostgreSQL wire protocol parse message to buf and returns it. // appendParse appends a PostgreSQL wire protocol parse message to buf and returns it.
func appendParse(buf []byte, name string, query string, parameterOIDs []pgtype.OID) []byte { func appendParse(buf []byte, name string, query string, parameterOIDs []pgtype.OID) []byte {

10
pgconn/pgconn.go
View File

@ -45,7 +45,7 @@ type PgError struct {
Routine string Routine string
} }
func (pe PgError) Error() string { func (pe *PgError) Error() string {
return pe.Severity + ": " + pe.Message + " (SQLSTATE " + pe.Code + ")" return pe.Severity + ": " + pe.Message + " (SQLSTATE " + pe.Code + ")"
} }
@ -118,7 +118,7 @@ func ConnectConfig(ctx context.Context, config *Config) (pgConn *PgConn, err err
pgConn, err = connect(ctx, config, fc) pgConn, err = connect(ctx, config, fc)
if err == nil { if err == nil {
return pgConn, nil return pgConn, nil
} else if err, ok := err.(PgError); ok { } else if err, ok := err.(*PgError); ok {
return nil, err return nil, err
} }
} }
@ -199,7 +199,7 @@ func connect(ctx context.Context, config *Config, fallbackConfig *FallbackConfig
// handled by ReceiveMessage // handled by ReceiveMessage
case *pgproto3.ErrorResponse: case *pgproto3.ErrorResponse:
pgConn.NetConn.Close() pgConn.NetConn.Close()
return nil, PgError{ return nil, &PgError{
Severity: msg.Severity, Severity: msg.Severity,
Code: msg.Code, Code: msg.Code,
Message: msg.Message, Message: msg.Message,
@ -654,8 +654,8 @@ func (pgConn *PgConn) Exec(ctx context.Context, sql string) (*PgResult, error) {
return result, nil return result, nil
} }
func errorResponseToPgError(msg *pgproto3.ErrorResponse) PgError { func errorResponseToPgError(msg *pgproto3.ErrorResponse) *PgError {
return PgError{ return &PgError{
Severity: msg.Severity, Severity: msg.Severity,
Code: msg.Code, Code: msg.Code,
Message: msg.Message, Message: msg.Message,

4
pgconn/pgconn_test.go
View File

@ -269,7 +269,7 @@ func TestConnExecMultipleQueriesError(t *testing.T) {
result, err := pgConn.Exec(context.Background(), "select 1; select 1/0; select 1") result, err := pgConn.Exec(context.Background(), "select 1; select 1/0; select 1")
require.NotNil(t, err) require.NotNil(t, err)
require.Nil(t, result) require.Nil(t, result)
if pgErr, ok := err.(pgconn.PgError); ok { if pgErr, ok := err.(*pgconn.PgError); ok {
assert.Equal(t, "22012", pgErr.Code) assert.Equal(t, "22012", pgErr.Code)
} else { } else {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
@ -331,7 +331,7 @@ func TestConnCancelQuery(t *testing.T) {
require.Nil(t, err) require.Nil(t, err)
_, err = pgConn.GetResult(context.Background()).Close() _, err = pgConn.GetResult(context.Background()).Close()
if err, ok := err.(pgconn.PgError); ok { if err, ok := err.(*pgconn.PgError); ok {
assert.Equal(t, "57014", err.Code) assert.Equal(t, "57014", err.Code)
} else { } else {
t.Errorf("expected pgconn.PgError got %v", err) t.Errorf("expected pgconn.PgError got %v", err)

3
query_test.go
View File

@ -13,6 +13,7 @@ import (
"github.com/cockroachdb/apd" "github.com/cockroachdb/apd"
"github.com/jackc/pgx" "github.com/jackc/pgx"
"github.com/jackc/pgx/pgconn"
"github.com/jackc/pgx/pgtype" "github.com/jackc/pgx/pgtype"
satori "github.com/jackc/pgx/pgtype/ext/satori-uuid" satori "github.com/jackc/pgx/pgtype/ext/satori-uuid"
uuid "github.com/satori/go.uuid" uuid "github.com/satori/go.uuid"
@ -415,7 +416,7 @@ func TestConnQueryErrorWhileReturningRows(t *testing.T) {
rows.Scan(&n) rows.Scan(&n)
} }
if err, ok := rows.Err().(pgx.PgError); !ok { if err, ok := rows.Err().(*pgconn.PgError); !ok {
t.Fatalf("Expected pgx.PgError, got %v", err) t.Fatalf("Expected pgx.PgError, got %v", err)
} }

3
stress_test.go
View File

@ -13,6 +13,7 @@ import (
"github.com/jackc/fake" "github.com/jackc/fake"
"github.com/jackc/pgx" "github.com/jackc/pgx"
"github.com/jackc/pgx/pgconn"
) )
type execer interface { type execer interface {
@ -190,7 +191,7 @@ func queryErrorWhileReturningRows(q queryer, actionNum int) error {
rows.Scan(&n) rows.Scan(&n)
} }
if _, ok := rows.Err().(pgx.PgError); ok { if _, ok := rows.Err().(*pgconn.PgError); ok {
return nil return nil
} }
return rows.Err() return rows.Err()

4
tx_test.go
View File

@ -142,7 +142,7 @@ func TestTxCommitSerializationFailure(t *testing.T) {
} }
err = tx2.Commit() err = tx2.Commit()
if pgErr, ok := err.(pgx.PgError); !ok || pgErr.Code != "40001" { if pgErr, ok := err.(*pgconn.PgError); !ok || pgErr.Code != "40001" {
t.Fatalf("Expected serialization error 40001, got %#v", err) t.Fatalf("Expected serialization error 40001, got %#v", err)
} }
} }
@ -228,7 +228,7 @@ func TestBeginExReadOnly(t *testing.T) {
defer tx.Rollback() defer tx.Rollback()
_, err = conn.Exec("create table foo(id serial primary key)") _, err = conn.Exec("create table foo(id serial primary key)")
if pgErr, ok := err.(pgx.PgError); !ok || pgErr.Code != "25006" { if pgErr, ok := err.(*pgconn.PgError); !ok || pgErr.Code != "25006" {
t.Errorf("Expected error SQLSTATE 25006, but got %#v", err) t.Errorf("Expected error SQLSTATE 25006, but got %#v", err)
} }
} }

5
v4.md
View File

@ -34,8 +34,9 @@ Minor Potential Changes:
## Changes ## Changes
`pgconn.PgConn` now contains core PostgreSQL connection functionality. * `pgconn.PgConn` now contains core PostgreSQL connection functionality.
Test configuration now done with environment variables instead of `.gitignore`'d locally modified `conn_config_test.go` file. * Test configuration now done with environment variables instead of `.gitignore`'d locally modified `conn_config_test.go` file.
* PostgreSQL errors are now `*pgconn.PgError` instead of `pgx.PgError`.
### Incompatible Changes ### Incompatible Changes