diff pkg/imports/bn.go @ 4062:6c760abcff0e

Move handling of PostgreSQL errors to own package
author Tom Gottfried <tom@intevation.de>
date Thu, 25 Jul 2019 11:32:22 +0200
parents 6c5c15b2fb64
children fe3dd65c0891
line wrap: on
line diff
--- a/pkg/imports/bn.go	Thu Jul 25 11:11:02 2019 +0200
+++ b/pkg/imports/bn.go	Thu Jul 25 11:32:22 2019 +0200
@@ -24,7 +24,7 @@
 	"strings"
 	"time"
 
-	"gemma.intevation.de/gemma/pkg/common"
+	"gemma.intevation.de/gemma/pkg/pgxutils"
 	"gemma.intevation.de/gemma/pkg/soap/ifbn"
 	"github.com/jackc/pgx/pgtype"
 )
@@ -591,7 +591,7 @@
 		)
 	}
 	if err != nil {
-		feedback.Warn(common.HandlePGError(err).Error())
+		feedback.Warn(pgxutils.HandlePGError(err).Error())
 		return nil
 	}
 	defer bns.Close()
@@ -603,7 +603,7 @@
 		bnIds = append(bnIds, nid)
 	}
 	if err := bns.Err(); err != nil {
-		feedback.Warn(common.HandlePGError(err).Error())
+		feedback.Warn(pgxutils.HandlePGError(err).Error())
 		return nil
 	}
 	if len(bnIds) == 0 {
@@ -620,7 +620,7 @@
 		&validity,
 		&pgBnIds,
 	); err != nil {
-		feedback.Warn(common.HandlePGError(err).Error())
+		feedback.Warn(pgxutils.HandlePGError(err).Error())
 		if err2 := tx.Rollback(); err2 != nil {
 			return err2
 		}
@@ -633,7 +633,7 @@
 		bn.Bottleneck_id,
 		validity,
 	); err != nil {
-		feedback.Warn(common.HandlePGError(err).Error())
+		feedback.Warn(pgxutils.HandlePGError(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(common.HandlePGError(err).Error())
+			feedback.Warn(pgxutils.HandlePGError(err).Error())
 			return nil
 		}
 	}