# HG changeset patch # User Tom Gottfried # Date 1558000424 -7200 # Node ID e640f51b5a4e8ccefd5e1d81bed2fe3ba9e9a5cf # Parent aac1ca73e92a2425a374143fd5971681c501d21a Fix reporting of removed reference water levels Since more than one reference water level might be removed, do not discard all but the first returned row. diff -r aac1ca73e92a -r e640f51b5a4e pkg/imports/wg.go --- a/pkg/imports/wg.go Thu May 16 11:28:44 2019 +0200 +++ b/pkg/imports/wg.go Thu May 16 11:53:44 2019 +0200 @@ -330,23 +330,25 @@ string(*dr.Reflevel2code), string(*dr.Reflevel3code), }) - var delRef string - err = tx.StmtContext( - ctx, deleteReferenceWaterLevelsStmt).QueryRowContext(ctx, + rwls, err := tx.StmtContext( + ctx, deleteReferenceWaterLevelsStmt).QueryContext(ctx, ic.code.CountryCode, ic.code.LoCode, ic.code.FairwaySection, ic.code.Orc, ic.code.Hectometre, &currLevels, - ).Scan(&delRef) - switch { - case err == sql.ErrNoRows: - // There was nothing to delete - case err != nil: + ) + if err != nil { return nil, err - default: - feedback.Info("Removed reference water level %s from %s", + } + defer rwls.Close() + for rwls.Next() { + var delRef string + if err = rwls.Scan(&delRef); err != nil { + return nil, err + } + feedback.Warn("Removed reference water level %s from %s", delRef, ic.code) }