fix(db.ScanRows): ensure rows.Close is called

uptrace · Jun 17, 2022 · 9ffbc6a · 9ffbc6a
1 parent 7d72761
commit 9ffbc6a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/db.go b/db.go
@@ -141,13 +141,19 @@ func (db *DB) Dialect() schema.Dialect {
 }
 
 func (db *DB) ScanRows(ctx context.Context, rows *sql.Rows, dest ...interface{}) error {
+	defer rows.Close()
+
 	model, err := newModel(db, dest)
 	if err != nil {
 		return err
 	}
 
 	_, err = model.ScanRows(ctx, rows)
-	return err
+	if err != nil {
+		return err
+	}
+
+	return rows.Err()
 }
 
 func (db *DB) ScanRow(ctx context.Context, rows *sql.Rows, dest ...interface{}) error {