diff pkg/imports/bn.go @ 4071:5867dcf8e93c

Introduced a new ReadableError type for better readable error messages of pgx.PgErrors.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 25 Jul 2019 13:31:51 +0200
parents fe3dd65c0891
children af2b20d6c921 3d2f02c16765
line wrap: on
line diff
--- a/pkg/imports/bn.go	Thu Jul 25 12:32:10 2019 +0200
+++ b/pkg/imports/bn.go	Thu Jul 25 13:31:51 2019 +0200
@@ -591,7 +591,7 @@
 		)
 	}
 	if err != nil {
-		feedback.Warn(pgxutils.HandleError(err).Error())
+		feedback.Warn(pgxutils.ReadableError{err}.Error())
 		return nil
 	}
 	defer bns.Close()
@@ -603,7 +603,7 @@
 		bnIds = append(bnIds, nid)
 	}
 	if err := bns.Err(); err != nil {
-		feedback.Warn(pgxutils.HandleError(err).Error())
+		feedback.Warn(pgxutils.ReadableError{err}.Error())
 		return nil
 	}
 	if len(bnIds) == 0 {
@@ -620,7 +620,7 @@
 		&validity,
 		&pgBnIds,
 	); err != nil {
-		feedback.Warn(pgxutils.HandleError(err).Error())
+		feedback.Warn(pgxutils.ReadableError{err}.Error())
 		if err2 := tx.Rollback(); err2 != nil {
 			return err2
 		}
@@ -633,7 +633,7 @@
 		bn.Bottleneck_id,
 		validity,
 	); err != nil {
-		feedback.Warn(pgxutils.HandleError(err).Error())
+		feedback.Warn(pgxutils.ReadableError{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.HandleError(err).Error())
+			feedback.Warn(pgxutils.ReadableError{err}.Error())
 			return nil
 		}
 	}