Mercurial > gemma
changeset 4063:fe3dd65c0891
Rename HandlePGError to HandleError.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 25 Jul 2019 11:46:23 +0200 |
parents | 6c760abcff0e |
children | 3eaa3ee4630f |
files | client/src/components/importoverview/AGMLogItem.vue pkg/controllers/user.go pkg/imports/bn.go pkg/imports/fd.go pkg/imports/gm.go pkg/imports/sec.go pkg/imports/st.go pkg/imports/wa.go pkg/imports/wg.go pkg/imports/wx.go pkg/pgxutils/errors.go |
diffstat | 11 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/importoverview/AGMLogItem.vue Thu Jul 25 11:32:22 2019 +0200 +++ b/client/src/components/importoverview/AGMLogItem.vue Thu Jul 25 11:46:23 2019 +0200 @@ -69,7 +69,7 @@ return result && result.versions && result.versions.length === 1; }, isOld(result) { - return !this.isNew(result); + return result && result.versions && result.versions.length === 2 && result.versions[1] !== null; }, isDifferent(result, entry) { return (
--- a/pkg/controllers/user.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/controllers/user.go Thu Jul 25 11:46:23 2019 +0200 @@ -263,7 +263,7 @@ } if err != nil { - err = pgxutils.HandlePGError(err) + err = pgxutils.HandleError(err) return }
--- a/pkg/imports/bn.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/bn.go Thu Jul 25 11:46:23 2019 +0200 @@ -591,7 +591,7 @@ ) } if err != nil { - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) return nil } defer bns.Close() @@ -603,7 +603,7 @@ bnIds = append(bnIds, nid) } if err := bns.Err(); err != nil { - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) return nil } if len(bnIds) == 0 { @@ -620,7 +620,7 @@ &validity, &pgBnIds, ); err != nil { - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return err2 } @@ -633,7 +633,7 @@ bn.Bottleneck_id, validity, ); err != nil { - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return err2 } @@ -670,7 +670,7 @@ &pgMaterials, ); err != nil { feedback.Warn("Failed to insert riverbed materials") - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) return nil } }
--- a/pkg/imports/fd.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/fd.go Thu Jul 25 11:46:23 2019 +0200 @@ -311,7 +311,7 @@ // ignore -> filtered by responsibility_areas continue features case err != nil: - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) continue features } // Store for potential later removal.
--- a/pkg/imports/gm.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/gm.go Thu Jul 25 11:46:23 2019 +0200 @@ -457,7 +457,7 @@ case err == sql.ErrNoRows: // thats expected, nothing to do case err != nil: - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) default: newP++ } @@ -488,7 +488,7 @@ case err == sql.ErrNoRows: // thats expected, nothing to do case err != nil: - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) default: newM++ }
--- a/pkg/imports/sec.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/sec.go Thu Jul 25 11:46:23 2019 +0200 @@ -182,7 +182,7 @@ sec.Source, sec.Tolerance, ).Scan(&id); err != nil { - return nil, pgxutils.HandlePGError(err) + return nil, pgxutils.HandleError(err) } if err := track(ctx, tx, importID, "waterway.sections", id); err != nil {
--- a/pkg/imports/st.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/st.go Thu Jul 25 11:46:23 2019 +0200 @@ -203,7 +203,7 @@ st.Source, st.Tolerance, ).Scan(&id); err != nil { - return nil, pgxutils.HandlePGError(err) + return nil, pgxutils.HandleError(err) } // store the associated countries.
--- a/pkg/imports/wa.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/wa.go Thu Jul 25 11:46:23 2019 +0200 @@ -247,7 +247,7 @@ outside++ // ignore -> filtered by responsibility_areas case err != nil: - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) default: features++ }
--- a/pkg/imports/wg.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/wg.go Thu Jul 25 11:46:23 2019 +0200 @@ -327,7 +327,7 @@ ).Scan(&isNew) switch { case err != nil: - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -352,7 +352,7 @@ source, time.Time(*dr.Lastupdate), ); err != nil { - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -389,7 +389,7 @@ unchanged++ continue case err2 != nil: - feedback.Warn(pgxutils.HandlePGError(err2).Error()) + feedback.Warn(pgxutils.HandleError(err2).Error()) if err3 := tx.Rollback(); err3 != nil { return nil, err3 } @@ -436,7 +436,7 @@ code.String(), &validity, ); err != nil { - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -484,7 +484,7 @@ string(**wl.level), int64(**wl.value), ); err != nil { - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) tx.Rollback() continue }
--- a/pkg/imports/wx.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/imports/wx.go Thu Jul 25 11:46:23 2019 +0200 @@ -321,7 +321,7 @@ // ignore -> filtered by responsibility_areas return nil case err != nil: - feedback.Warn(pgxutils.HandlePGError(err).Error()) + feedback.Warn(pgxutils.HandleError(err).Error()) default: *features++ }
--- a/pkg/pgxutils/errors.go Thu Jul 25 11:32:22 2019 +0200 +++ b/pkg/pgxutils/errors.go Thu Jul 25 11:46:23 2019 +0200 @@ -20,7 +20,7 @@ ) // Handle PostgreSQL error codes -func HandlePGError(err error) error { +func HandleError(err error) error { switch e := err.(type) { case pgx.PgError: return dbError(e)