rows.Close gets invoked only after checking an error for nil (#46)

go-rel · Feb 11, 2023 · a28278b · a28278b
1 parent 1bc6967
commit a28278b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/sql.go b/sql.go
@@ -197,9 +197,14 @@ func (s SQL) Aggregate(ctx context.Context, query rel.Query, mode string, field
 		rows, err       = s.DoQuery(ctx, statement, args)
 	)
 
+	if err != nil {
+		return 0, s.ErrorMapper(err)
+	}
+
 	defer rows.Close()
-	if err == nil && rows.Next() {
-		rows.Scan(&out)
+
+	if rows.Next() {
+		err = rows.Scan(&out)
 	}
 
 	return int(out.Int64), s.ErrorMapper(err)