Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: user errors.As for error type assertion #125

Merged
merged 1 commit into from Feb 8, 2022
Merged

fix: user errors.As for error type assertion #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 0 additions & 17 deletions crdb/error.go
View file
Open in desktop
Expand Up @@ -16,23 +16,6 @@ package crdb

import "fmt"

// errorCause returns the original cause of the error, if possible. An
// error has a proximate cause if it's type is compatible with Go's
// errors.Unwrap() or pkg/errors' Cause(); the original cause is the
// end of the causal chain.
func errorCause(err error) error {
for err != nil {
if c, ok := err.(interface{ Cause() error }); ok {
err = c.Cause()
} else if c, ok := err.(interface{ Unwrap() error }); ok {
err = c.Unwrap()
} else {
break
}
}
return err
}

type txError struct {
cause error
}
Expand Down
18 changes: 10 additions & 8 deletions crdb/tx.go
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ package crdb
import (
"context"
"database/sql"
"errors"

"github.com/lib/pq"
)
Expand Down Expand Up @@ -193,16 +194,17 @@ func errIsRetryable(err error) bool {
}

func errCode(err error) string {
switch t := errorCause(err).(type) {
case *pq.Error:
return string(t.Code)

case errWithSQLState:
return t.SQLState()
var pqe *pq.Error
if errors.As(err, &pqe) {
return string(pqe.Code)
}

default:
return ""
var sqlErr errWithSQLState
if errors.As(err, &sqlErr) {
return sqlErr.SQLState()
}

return ""
}

// errWithSQLState is implemented by pgx (pgconn.PgError).
Expand Down