Use github.com/pkg/errors

range.go

@@ -3,7 +3,8 @@ package pgtype
 import (
 	"bytes"
 	"encoding/binary"
-	"fmt"
+
+	"github.com/pkg/errors"
 )
 
 type BoundType byte
@@ -36,7 +37,7 @@ func ParseUntypedTextRange(src string) (*UntypedTextRange, error) {
 
 	r, _, err := buf.ReadRune()
 	if err != nil {
-		return nil, fmt.Errorf("invalid lower bound: %v", err)
+		return nil, errors.Errorf("invalid lower bound: %v", err)
 	}
 	switch r {
 	case '(':
@@ -44,12 +45,12 @@ func ParseUntypedTextRange(src string) (*UntypedTextRange, error) {
 	case '[':
 		utr.LowerType = Inclusive
 	default:
-		return nil, fmt.Errorf("missing lower bound, instead got: %v", string(r))
+		return nil, errors.Errorf("missing lower bound, instead got: %v", string(r))
 	}
 
 	r, _, err = buf.ReadRune()
 	if err != nil {
-		return nil, fmt.Errorf("invalid lower value: %v", err)
+		return nil, errors.Errorf("invalid lower value: %v", err)
 	}
 	buf.UnreadRune()
 
@@ -58,21 +59,21 @@ func ParseUntypedTextRange(src string) (*UntypedTextRange, error) {
 	} else {
 		utr.Lower, err = rangeParseValue(buf)
 		if err != nil {
-			return nil, fmt.Errorf("invalid lower value: %v", err)
+			return nil, errors.Errorf("invalid lower value: %v", err)
 		}
 	}
 
 	r, _, err = buf.ReadRune()
 	if err != nil {
-		return nil, fmt.Errorf("missing range separator: %v", err)
+		return nil, errors.Errorf("missing range separator: %v", err)
 	}
 	if r != ',' {
-		return nil, fmt.Errorf("missing range separator: %v", r)
+		return nil, errors.Errorf("missing range separator: %v", r)
 	}
 
 	r, _, err = buf.ReadRune()
 	if err != nil {
-		return nil, fmt.Errorf("invalid upper value: %v", err)
+		return nil, errors.Errorf("invalid upper value: %v", err)
 	}
 	buf.UnreadRune()
 
@@ -81,13 +82,13 @@ func ParseUntypedTextRange(src string) (*UntypedTextRange, error) {
 	} else {
 		utr.Upper, err = rangeParseValue(buf)
 		if err != nil {
-			return nil, fmt.Errorf("invalid upper value: %v", err)
+			return nil, errors.Errorf("invalid upper value: %v", err)
 		}
 	}
 
 	r, _, err = buf.ReadRune()
 	if err != nil {
-		return nil, fmt.Errorf("missing upper bound: %v", err)
+		return nil, errors.Errorf("missing upper bound: %v", err)
 	}
 	switch r {
 	case ')':
@@ -95,13 +96,13 @@ func ParseUntypedTextRange(src string) (*UntypedTextRange, error) {
 	case ']':
 		utr.UpperType = Inclusive
 	default:
-		return nil, fmt.Errorf("missing upper bound, instead got: %v", string(r))
+		return nil, errors.Errorf("missing upper bound, instead got: %v", string(r))
 	}
 
 	skipWhitespace(buf)
 
 	if buf.Len() > 0 {
-		return nil, fmt.Errorf("unexpected trailing data: %v", buf.String())
+		return nil, errors.Errorf("unexpected trailing data: %v", buf.String())
 	}
 
 	return utr, nil
@@ -197,7 +198,7 @@ func ParseUntypedBinaryRange(src []byte) (*UntypedBinaryRange, error) {
 	ubr := &UntypedBinaryRange{}
 
 	if len(src) == 0 {
-		return nil, fmt.Errorf("range too short: %v", len(src))
+		return nil, errors.Errorf("range too short: %v", len(src))
 	}
 
 	rangeType := src[0]
@@ -205,7 +206,7 @@ func ParseUntypedBinaryRange(src []byte) (*UntypedBinaryRange, error) {
 
 	if rangeType&emptyMask > 0 {
 		if len(src[rp:]) > 0 {
-			return nil, fmt.Errorf("unexpected trailing bytes parsing empty range: %v", len(src[rp:]))
+			return nil, errors.Errorf("unexpected trailing bytes parsing empty range: %v", len(src[rp:]))
 		}
 		ubr.LowerType = Empty
 		ubr.UpperType = Empty
@@ -230,13 +231,13 @@ func ParseUntypedBinaryRange(src []byte) (*UntypedBinaryRange, error) {
 
 	if ubr.LowerType == Unbounded && ubr.UpperType == Unbounded {
 		if len(src[rp:]) > 0 {
-			return nil, fmt.Errorf("unexpected trailing bytes parsing unbounded range: %v", len(src[rp:]))
+			return nil, errors.Errorf("unexpected trailing bytes parsing unbounded range: %v", len(src[rp:]))
 		}
 		return ubr, nil
 	}
 
 	if len(src[rp:]) < 4 {
-		return nil, fmt.Errorf("too few bytes for size: %v", src[rp:])
+		return nil, errors.Errorf("too few bytes for size: %v", src[rp:])
 	}
 	valueLen := int(binary.BigEndian.Uint32(src[rp:]))
 	rp += 4
@@ -249,14 +250,14 @@ func ParseUntypedBinaryRange(src []byte) (*UntypedBinaryRange, error) {
 	} else {
 		ubr.Upper = val
 		if len(src[rp:]) > 0 {
-			return nil, fmt.Errorf("unexpected trailing bytes parsing range: %v", len(src[rp:]))
+			return nil, errors.Errorf("unexpected trailing bytes parsing range: %v", len(src[rp:]))
 		}
 		return ubr, nil
 	}
 
 	if ubr.UpperType != Unbounded {
 		if len(src[rp:]) < 4 {
-			return nil, fmt.Errorf("too few bytes for size: %v", src[rp:])
+			return nil, errors.Errorf("too few bytes for size: %v", src[rp:])
 		}
 		valueLen := int(binary.BigEndian.Uint32(src[rp:]))
 		rp += 4
@@ -265,7 +266,7 @@ func ParseUntypedBinaryRange(src []byte) (*UntypedBinaryRange, error) {
 	}
 
 	if len(src[rp:]) > 0 {
-		return nil, fmt.Errorf("unexpected trailing bytes parsing range: %v", len(src[rp:]))
+		return nil, errors.Errorf("unexpected trailing bytes parsing range: %v", len(src[rp:]))
 	}
 
 	return ubr, nil