@@ -35,11 +35,11 @@ func parsePath(sqlPath string, inPkg string, s *Schema, settings dinosql.Generat
35
35
for _ , filename := range files {
36
36
blob , err := ioutil .ReadFile (filename )
37
37
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 )
39
39
}
40
40
contents := dinosql .RemoveRollbackStatements (string (blob ))
41
41
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 )
43
43
}
44
44
queries , err := parseContents (filename , contents , s , settings )
45
45
if err != nil {
@@ -69,7 +69,7 @@ func parseContents(filename, contents string, s *Schema, settings dinosql.Genera
69
69
query := contents [start : t .Position - 1 ]
70
70
result , err := parseQueryString (q , query , s , settings )
71
71
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 )
73
73
}
74
74
start = t .Position
75
75
if result == nil {
@@ -87,26 +87,26 @@ func parseQueryString(tree sqlparser.Statement, query string, s *Schema, setting
87
87
case * sqlparser.Select :
88
88
selectQuery , err := parseSelect (tree , query , s , settings )
89
89
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 )
91
91
}
92
92
parsedQuery = selectQuery
93
93
case * sqlparser.Insert :
94
94
insert , err := parseInsert (tree , query , s , settings )
95
95
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 )
97
97
}
98
98
parsedQuery = insert
99
99
case * sqlparser.Update :
100
100
update , err := parseUpdate (tree , query , s , settings )
101
101
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 )
103
103
}
104
104
parsedQuery = update
105
105
case * sqlparser.Delete :
106
106
delete , err := parseDelete (tree , query , s , settings )
107
107
delete .SchemaLookup = nil
108
108
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 )
110
110
}
111
111
parsedQuery = delete
112
112
case * sqlparser.DDL :
@@ -118,7 +118,7 @@ func parseQueryString(tree sqlparser.Statement, query string, s *Schema, setting
118
118
}
119
119
paramsReplacedQuery , err := replaceParamStrs (sqlparser .String (tree ), parsedQuery .Params )
120
120
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 )
122
122
}
123
123
parsedQuery .SQL = paramsReplacedQuery
124
124
return parsedQuery , nil
@@ -131,15 +131,15 @@ func (q *Query) parseNameAndCmd() error {
131
131
_ , comments := sqlparser .SplitMarginComments (q .SQL )
132
132
err := q .parseLeadingComment (comments .Leading )
133
133
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 )
135
135
}
136
136
return nil
137
137
}
138
138
139
139
func parseSelect (tree * sqlparser.Select , query string , s * Schema , settings dinosql.GenerateSettings ) (* Query , error ) {
140
140
tableAliasMap , err := parseFrom (tree .From , false )
141
141
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 )
143
143
}
144
144
defaultTableName := getDefaultTable (tableAliasMap )
145
145
@@ -251,7 +251,7 @@ func getDefaultTable(tableAliasMap FromTables) string {
251
251
func parseUpdate (node * sqlparser.Update , query string , s * Schema , settings dinosql.GenerateSettings ) (* Query , error ) {
252
252
tableAliasMap , err := parseFrom (node .TableExprs , false )
253
253
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 )
255
255
}
256
256
defaultTable := getDefaultTable (tableAliasMap )
257
257
if err != nil {
@@ -267,7 +267,7 @@ func parseUpdate(node *sqlparser.Update, query string, s *Schema, settings dinos
267
267
}
268
268
colDfn , err := s .getColType (col , tableAliasMap , defaultTable )
269
269
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 )
271
271
}
272
272
originalParamName := string (newValue .Val )
273
273
param := Param {
@@ -280,7 +280,7 @@ func parseUpdate(node *sqlparser.Update, query string, s *Schema, settings dinos
280
280
281
281
whereParams , err := paramsInWhereExpr (node .Where .Expr , s , tableAliasMap , defaultTable , settings )
282
282
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 )
284
284
}
285
285
286
286
parsedQuery := Query {
@@ -342,7 +342,7 @@ func parseInsert(node *sqlparser.Insert, query string, s *Schema, settings dinos
342
342
func parseDelete (node * sqlparser.Delete , query string , s * Schema , settings dinosql.GenerateSettings ) (* Query , error ) {
343
343
tableAliasMap , err := parseFrom (node .TableExprs , false )
344
344
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 )
346
346
}
347
347
defaultTableName := getDefaultTable (tableAliasMap )
348
348
if err != nil {
0 commit comments