Skip to content

Commit a28278b

Browse files
authored
rows.Close gets invoked only after checking an error for nil (#46)
1 parent 1bc6967 commit a28278b

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

sql.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,14 @@ func (s SQL) Aggregate(ctx context.Context, query rel.Query, mode string, field
197197
rows, err = s.DoQuery(ctx, statement, args)
198198
)
199199

200+
if err != nil {
201+
return 0, s.ErrorMapper(err)
202+
}
203+
200204
defer rows.Close()
201-
if err == nil && rows.Next() {
202-
rows.Scan(&out)
205+
206+
if rows.Next() {
207+
err = rows.Scan(&out)
203208
}
204209

205210
return int(out.Int64), s.ErrorMapper(err)

0 commit comments

Comments
 (0)