Skip to content

Commit

Permalink
chore(spanner): enable Go 1.13 error wrapping (#6795)
Browse files Browse the repository at this point in the history
  • Loading branch information
quartzmo committed Oct 6, 2022
1 parent 0adf1be commit 7934007
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions spanner/spannertest/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ func valForType(v *structpb.Value, t spansql.Type) (interface{}, error) {
if ok {
x, err := strconv.ParseInt(sv.StringValue, 10, 64)
if err != nil {
return nil, fmt.Errorf("bad int64 string %q: %v", sv.StringValue, err)
return nil, fmt.Errorf("bad int64 string %q: %w", sv.StringValue, err)
}
return x, nil
}
Expand All @@ -1116,7 +1116,7 @@ func valForType(v *structpb.Value, t spansql.Type) (interface{}, error) {
s := sv.StringValue
d, err := parseAsDate(s)
if err != nil {
return nil, fmt.Errorf("bad DATE string %q: %v", s, err)
return nil, fmt.Errorf("bad DATE string %q: %w", s, err)
}
return d, nil
}
Expand All @@ -1130,7 +1130,7 @@ func valForType(v *structpb.Value, t spansql.Type) (interface{}, error) {
}
t, err := parseAsTimestamp(s)
if err != nil {
return nil, fmt.Errorf("bad TIMESTAMP string %q: %v", s, err)
return nil, fmt.Errorf("bad TIMESTAMP string %q: %w", s, err)
}
return t, nil
}
Expand Down
6 changes: 3 additions & 3 deletions spanner/spannertest/db_eval.go
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ func (ec evalContext) coerceString(target spansql.Expr, slit spansql.StringLiter
case spansql.Date:
d, err := parseAsDate(string(slit))
if err != nil {
return nil, fmt.Errorf("coercing string literal %q to DATE: %v", slit, err)
return nil, fmt.Errorf("coercing string literal %q to DATE: %w", slit, err)
}
return coercedValue{
val: d,
Expand All @@ -658,7 +658,7 @@ func (ec evalContext) coerceString(target spansql.Expr, slit spansql.StringLiter
case spansql.Timestamp:
t, err := parseAsTimestamp(string(slit))
if err != nil {
return nil, fmt.Errorf("coercing string literal %q to TIMESTAMP: %v", slit, err)
return nil, fmt.Errorf("coercing string literal %q to TIMESTAMP: %w", slit, err)
}
return coercedValue{
val: t,
Expand Down Expand Up @@ -758,7 +758,7 @@ func paramAsInteger(p spansql.Param, params queryParams) (int64, error) {
case string:
x, err := strconv.ParseInt(v, 10, 64)
if err != nil {
return 0, fmt.Errorf("bad int64 string %q: %v", v, err)
return 0, fmt.Errorf("bad int64 string %q: %w", v, err)
}
return x, nil
}
Expand Down
6 changes: 3 additions & 3 deletions spanner/spannertest/db_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ func (d *database) evalSelect(sel spansql.Select, qc *queryContext) (si *selIter
if !starArg {
ci, err := ec.colInfo(fexpr.Args[0])
if err != nil {
return nil, fmt.Errorf("evaluating aggregate function %s arg type: %v", fexpr.Name, err)
return nil, fmt.Errorf("evaluating aggregate function %s arg type: %w", fexpr.Name, err)
}
argType = ci.Type
}
Expand Down Expand Up @@ -717,7 +717,7 @@ func (d *database) evalSelectFrom(qc *queryContext, ec evalContext, sf spansql.S
// TODO: Do all relevant types flow through here? Path expressions might be tricky here.
col, err := ec.colInfo(sf.Expr)
if err != nil {
return ec, nil, fmt.Errorf("evaluating type of UNNEST arg: %v", err)
return ec, nil, fmt.Errorf("evaluating type of UNNEST arg: %w", err)
}
if !col.Type.Array {
return ec, nil, fmt.Errorf("type of UNNEST arg is non-array %s", col.Type.SQL())
Expand All @@ -729,7 +729,7 @@ func (d *database) evalSelectFrom(qc *queryContext, ec evalContext, sf spansql.S
// Evaluate the expression, and yield a virtual table with one column.
e, err := ec.evalExpr(sf.Expr)
if err != nil {
return ec, nil, fmt.Errorf("evaluating UNNEST arg: %v", err)
return ec, nil, fmt.Errorf("evaluating UNNEST arg: %w", err)
}
arr, ok := e.([]interface{})
if !ok {
Expand Down
2 changes: 1 addition & 1 deletion spanner/value.go
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ func (n *NullJSON) UnmarshalJSON(payload []byte) error {
var v interface{}
err := json.Unmarshal(payload, &v)
if err != nil {
return fmt.Errorf("payload cannot be converted to a struct: got %v, err: %s", string(payload), err)
return fmt.Errorf("payload cannot be converted to a struct: got %v, err: %w", string(payload), err)
}
n.Value = v
n.Valid = true
Expand Down

0 comments on commit 7934007

Please sign in to comment.