Mercurial > gemma

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/wg.go	Thu Jul 25 11:11:02 2019 +0200
+++ b/pkg/imports/wg.go	Thu Jul 25 11:32:22 2019 +0200
@@ -21,8 +21,8 @@
 
 	"github.com/jackc/pgx/pgtype"
 
-	"gemma.intevation.de/gemma/pkg/common"
 	"gemma.intevation.de/gemma/pkg/models"
+	"gemma.intevation.de/gemma/pkg/pgxutils"
 	"gemma.intevation.de/gemma/pkg/soap/erdms"
 )
 
@@ -327,7 +327,7 @@
 			).Scan(&isNew)
 			switch {
 			case err != nil:
-				feedback.Warn(common.HandlePGError(err).Error())
+				feedback.Warn(pgxutils.HandlePGError(err).Error())
 				if err2 := tx.Rollback(); err2 != nil {
 					return nil, err2
 				}
@@ -352,7 +352,7 @@
 					source,
 					time.Time(*dr.Lastupdate),
 				); err != nil {
-					feedback.Warn(common.HandlePGError(err).Error())
+					feedback.Warn(pgxutils.HandlePGError(err).Error())
 					if err2 := tx.Rollback(); err2 != nil {
 						return nil, err2
 					}
@@ -389,7 +389,7 @@
 					unchanged++
 					continue
 				case err2 != nil:
-					feedback.Warn(common.HandlePGError(err2).Error())
+					feedback.Warn(pgxutils.HandlePGError(err2).Error())
 					if err3 := tx.Rollback(); err3 != nil {
 						return nil, err3
 					}
@@ -436,7 +436,7 @@
 				code.String(),
 				&validity,
 			); err != nil {
-				feedback.Warn(common.HandlePGError(err).Error())
+				feedback.Warn(pgxutils.HandlePGError(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(common.HandlePGError(err).Error())
+					feedback.Warn(pgxutils.HandlePGError(err).Error())
 					tx.Rollback()
 					continue
 				}