Skip to content

Commit 63dbb0c

Browse files
jmhodgeskyleconroy
authored andcommitted
use %w for wrapping errors in fmt.Errorf (#250)
This corrects all the places where fmt.Errorf wasn't already using the %w directive for wrapping errors. A small quality of life change. Found all of these with ag --no-heading 'fmt\.Errorf\(.*, err' | grep -v '%w'
1 parent 1766d19 commit 63dbb0c

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

internal/dinosql/gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ func Generate(r Generateable, settings GenerateSettings) (map[string]string, err
11561156
code, err := format.Source(b.Bytes())
11571157
if err != nil {
11581158
fmt.Println(b.String())
1159-
return fmt.Errorf("source error: %s", err)
1159+
return fmt.Errorf("source error: %w", err)
11601160
}
11611161
if !strings.HasSuffix(name, ".go") {
11621162
name += ".go"

internal/mysql/parse.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ func parsePath(sqlPath string, inPkg string, s *Schema, settings dinosql.Generat
3535
for _, filename := range files {
3636
blob, err := ioutil.ReadFile(filename)
3737
if err != nil {
38-
return nil, fmt.Errorf("Failed to read file [%v]: %v", filename, err)
38+
return nil, fmt.Errorf("Failed to read file [%v]: %w", filename, err)
3939
}
4040
contents := dinosql.RemoveRollbackStatements(string(blob))
4141
if err != nil {
42-
return nil, fmt.Errorf("Failed to read contents of file [%v]: %v", filename, err)
42+
return nil, fmt.Errorf("Failed to read contents of file [%v]: %w", filename, err)
4343
}
4444
queries, err := parseContents(filename, contents, s, settings)
4545
if err != nil {
@@ -69,7 +69,7 @@ func parseContents(filename, contents string, s *Schema, settings dinosql.Genera
6969
query := contents[start : t.Position-1]
7070
result, err := parseQueryString(q, query, s, settings)
7171
if err != nil {
72-
return nil, fmt.Errorf("Failed to parse query in filepath [%v]: %v", filename, err)
72+
return nil, fmt.Errorf("Failed to parse query in filepath [%v]: %w", filename, err)
7373
}
7474
start = t.Position
7575
if result == nil {
@@ -87,26 +87,26 @@ func parseQueryString(tree sqlparser.Statement, query string, s *Schema, setting
8787
case *sqlparser.Select:
8888
selectQuery, err := parseSelect(tree, query, s, settings)
8989
if err != nil {
90-
return nil, fmt.Errorf("Failed to parse SELECT query: %v", err)
90+
return nil, fmt.Errorf("Failed to parse SELECT query: %w", err)
9191
}
9292
parsedQuery = selectQuery
9393
case *sqlparser.Insert:
9494
insert, err := parseInsert(tree, query, s, settings)
9595
if err != nil {
96-
return nil, fmt.Errorf("Failed to parse INSERT query: %v", err)
96+
return nil, fmt.Errorf("Failed to parse INSERT query: %w", err)
9797
}
9898
parsedQuery = insert
9999
case *sqlparser.Update:
100100
update, err := parseUpdate(tree, query, s, settings)
101101
if err != nil {
102-
return nil, fmt.Errorf("Failed to parse UPDATE query: %v", err)
102+
return nil, fmt.Errorf("Failed to parse UPDATE query: %w", err)
103103
}
104104
parsedQuery = update
105105
case *sqlparser.Delete:
106106
delete, err := parseDelete(tree, query, s, settings)
107107
delete.SchemaLookup = nil
108108
if err != nil {
109-
return nil, fmt.Errorf("Failed to parse DELETE query: %v", err)
109+
return nil, fmt.Errorf("Failed to parse DELETE query: %w", err)
110110
}
111111
parsedQuery = delete
112112
case *sqlparser.DDL:
@@ -118,7 +118,7 @@ func parseQueryString(tree sqlparser.Statement, query string, s *Schema, setting
118118
}
119119
paramsReplacedQuery, err := replaceParamStrs(sqlparser.String(tree), parsedQuery.Params)
120120
if err != nil {
121-
return nil, fmt.Errorf("Failed to replace param variables in query string: %v", err)
121+
return nil, fmt.Errorf("Failed to replace param variables in query string: %w", err)
122122
}
123123
parsedQuery.SQL = paramsReplacedQuery
124124
return parsedQuery, nil
@@ -131,15 +131,15 @@ func (q *Query) parseNameAndCmd() error {
131131
_, comments := sqlparser.SplitMarginComments(q.SQL)
132132
err := q.parseLeadingComment(comments.Leading)
133133
if err != nil {
134-
return fmt.Errorf("Failed to parse leading comment %v", err)
134+
return fmt.Errorf("Failed to parse leading comment %w", err)
135135
}
136136
return nil
137137
}
138138

139139
func parseSelect(tree *sqlparser.Select, query string, s *Schema, settings dinosql.GenerateSettings) (*Query, error) {
140140
tableAliasMap, err := parseFrom(tree.From, false)
141141
if err != nil {
142-
return nil, fmt.Errorf("Failed to parse table name alias's: %v", err)
142+
return nil, fmt.Errorf("Failed to parse table name alias's: %w", err)
143143
}
144144
defaultTableName := getDefaultTable(tableAliasMap)
145145

@@ -251,7 +251,7 @@ func getDefaultTable(tableAliasMap FromTables) string {
251251
func parseUpdate(node *sqlparser.Update, query string, s *Schema, settings dinosql.GenerateSettings) (*Query, error) {
252252
tableAliasMap, err := parseFrom(node.TableExprs, false)
253253
if err != nil {
254-
return nil, fmt.Errorf("Failed to parse table name alias's: %v", err)
254+
return nil, fmt.Errorf("Failed to parse table name alias's: %w", err)
255255
}
256256
defaultTable := getDefaultTable(tableAliasMap)
257257
if err != nil {
@@ -267,7 +267,7 @@ func parseUpdate(node *sqlparser.Update, query string, s *Schema, settings dinos
267267
}
268268
colDfn, err := s.getColType(col, tableAliasMap, defaultTable)
269269
if err != nil {
270-
return nil, fmt.Errorf("Failed to determine type of a parameter's column: %v", err)
270+
return nil, fmt.Errorf("Failed to determine type of a parameter's column: %w", err)
271271
}
272272
originalParamName := string(newValue.Val)
273273
param := Param{
@@ -280,7 +280,7 @@ func parseUpdate(node *sqlparser.Update, query string, s *Schema, settings dinos
280280

281281
whereParams, err := paramsInWhereExpr(node.Where.Expr, s, tableAliasMap, defaultTable, settings)
282282
if err != nil {
283-
return nil, fmt.Errorf("Failed to parse params from WHERE expression: %v", err)
283+
return nil, fmt.Errorf("Failed to parse params from WHERE expression: %w", err)
284284
}
285285

286286
parsedQuery := Query{
@@ -342,7 +342,7 @@ func parseInsert(node *sqlparser.Insert, query string, s *Schema, settings dinos
342342
func parseDelete(node *sqlparser.Delete, query string, s *Schema, settings dinosql.GenerateSettings) (*Query, error) {
343343
tableAliasMap, err := parseFrom(node.TableExprs, false)
344344
if err != nil {
345-
return nil, fmt.Errorf("Failed to parse table name alias's: %v", err)
345+
return nil, fmt.Errorf("Failed to parse table name alias's: %w", err)
346346
}
347347
defaultTableName := getDefaultTable(tableAliasMap)
348348
if err != nil {

0 commit comments

Comments
 (0)