diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-02-02 20:41:08 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-02-02 20:41:08 +0100 |
commit | 3a9483b42354cc5486f5202e9694abe1ee835063 (patch) | |
tree | b64b356bfbc167a7fbd213009e035d8ecccb53ef | |
parent | 535354ca67fc940e904afb131a9206b84c7a1b2d (diff) |
Remove github.com/pkg/errors
-rw-r--r-- | go.mod | 1 | ||||
-rw-r--r-- | go.sum | 2 | ||||
-rw-r--r-- | record/norwegian/norwegian.go | 8 | ||||
-rw-r--r-- | record/record.go | 8 | ||||
-rw-r--r-- | sql/sql.go | 4 |
5 files changed, 9 insertions, 14 deletions
@@ -8,7 +8,6 @@ require ( github.com/jmoiron/sqlx v1.2.0 github.com/mattn/go-sqlite3 v1.13.0 github.com/olekukonko/tablewriter v0.0.4 - github.com/pkg/errors v0.8.0 github.com/tealeg/xlsx v1.0.5 google.golang.org/appengine v1.1.0 // indirect ) @@ -21,8 +21,6 @@ github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI6 github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE= github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM= google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= diff --git a/record/norwegian/norwegian.go b/record/norwegian/norwegian.go index 68504ff..93b9566 100644 --- a/record/norwegian/norwegian.go +++ b/record/norwegian/norwegian.go @@ -1,6 +1,7 @@ package norwegian import ( + "fmt" "io" "io/ioutil" "strconv" @@ -8,7 +9,6 @@ import ( "time" "github.com/mpolden/journal/record" - "github.com/pkg/errors" "github.com/tealeg/xlsx" ) @@ -58,7 +58,7 @@ func (r *Reader) Read() ([]record.Record, error) { return nil, err } if len(f.Sheets) == 0 { - return nil, errors.New("xlsx contains 0 sheets") + return nil, fmt.Errorf("xlsx contains 0 sheets") } var rs []record.Record for _, row := range f.Sheets[0].Rows { @@ -74,11 +74,11 @@ func (r *Reader) Read() ([]record.Record, error) { } time, err := time.Parse("01-02-06", cells[0].String()) if err != nil { - return nil, errors.Wrapf(err, "invalid date: %q", cells[0].String()) + return nil, fmt.Errorf("invalid date: %q: %w", cells[0].String(), err) } amount, err := r.parseAmount(cells[6].String()) if err != nil { - return nil, errors.Wrapf(err, "invalid amount: %q", cells[6].String()) + return nil, fmt.Errorf("invalid amount: %q: %w", cells[6].String(), err) } t := record.Record{ Time: time, diff --git a/record/record.go b/record/record.go index d3d665d..f30152b 100644 --- a/record/record.go +++ b/record/record.go @@ -11,8 +11,6 @@ import ( "strconv" "strings" "time" - - "github.com/pkg/errors" ) // Field identifies a record field. @@ -290,18 +288,18 @@ func (r *reader) Read() ([]Record, error) { } t, err := time.Parse("02.01.2006", record[0]) if err != nil { - return nil, errors.Wrapf(err, "invalid time on line %d: %q", line, record[0]) + return nil, fmt.Errorf("invalid time on line %d: %q: %w", line, record[0], err) } text := record[2] amount, err := r.parseAmount(record[3]) if err != nil { - return nil, errors.Wrapf(err, "invalid amount on line %d: %q", line, record[3]) + return nil, fmt.Errorf("invalid amount on line %d: %q: %w", line, record[3], err) } var balance int64 if record[4] != "" { balance, err = r.parseAmount(record[4]) if err != nil { - return nil, errors.Wrapf(err, "invalid balance on line %d: %q", line, record[4]) + return nil, fmt.Errorf("invalid balance on line %d: %q: %w", line, record[4], err) } } rs = append(rs, Record{Time: t, Text: text, Amount: amount, Balance: balance}) @@ -2,12 +2,12 @@ package sql import ( "database/sql" + "fmt" "sync" "time" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" // SQLite database driver - "github.com/pkg/errors" ) const schema = ` @@ -140,7 +140,7 @@ func (c *Client) AddRecords(accountNumber string, records []Record) (int64, erro accountID := 0 if err := tx.Get(&accountID, "SELECT id FROM account WHERE number = $1 LIMIT 1", accountNumber); err != nil { - return 0, errors.Wrapf(err, "invalid account: %s", accountNumber) + return 0, fmt.Errorf("invalid account: %s: %w", accountNumber, err) } query := ` |