Mercurial > gemma
changeset 3305:5932f9574493
Follow-up for 3350:e640f51b5a4e (Fix reporting of removed reference water levels).
Be more precise with error handling: added forgotten .Err() after looping over rows.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 17 May 2019 10:03:07 +0200 |
parents | ad27721d804d |
children | bf5ab7a069e2 b90b17d0b5a9 |
files | pkg/imports/wg.go |
diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/wg.go Fri May 17 09:51:28 2019 +0200 +++ b/pkg/imports/wg.go Fri May 17 10:03:07 2019 +0200 @@ -410,24 +410,27 @@ string(*dr.Reflevel2code), string(*dr.Reflevel3code), }) - rwls, err2 := tx.StmtContext(ctx, + rwls, err := tx.StmtContext(ctx, deleteReferenceWaterLevelsStmt).QueryContext(ctx, ic.code.String(), &validity, &currLevels, ) - if err2 != nil { - return nil, err2 + if err != nil { + return nil, err } defer rwls.Close() for rwls.Next() { var delRef string - if err2 = rwls.Scan(&delRef); err2 != nil { - return nil, err2 + if err := rwls.Scan(&delRef); err != nil { + return nil, err } feedback.Warn("Removed reference water level %s from %s", delRef, ic.code) } + if err := rwls.Err(); err != nil { + return nil, err + } case err != nil: feedback.Warn(handleError(err).Error()) if err2 := tx.Rollback(); err2 != nil {