# HG changeset patch # User Tom Gottfried # Date 1581962444 -3600 # Node ID df6c8a48597996a63097479b3c99b8b492970e1c # Parent b3b2ba09a450bbf2612fda297e6ab00ab3228b26 Improve handling of invalid dirimp values diff -r b3b2ba09a450 -r df6c8a485979 pkg/imports/fm_bcnlat.go --- a/pkg/imports/fm_bcnlat.go Mon Feb 17 18:38:45 2020 +0100 +++ b/pkg/imports/fm_bcnlat.go Mon Feb 17 19:00:44 2020 +0100 @@ -188,6 +188,9 @@ }); err != nil { feedback.Warn( pgxutils.ReadableError{Err: err}.Error()) + feedback.Info( + "Tried to import '%s' as dirimp value", + dirimp) } } } diff -r b3b2ba09a450 -r df6c8a485979 pkg/imports/fm_daymar.go --- a/pkg/imports/fm_daymar.go Mon Feb 17 18:38:45 2020 +0100 +++ b/pkg/imports/fm_daymar.go Mon Feb 17 19:00:44 2020 +0100 @@ -178,6 +178,9 @@ }); err != nil { feedback.Warn( pgxutils.ReadableError{Err: err}.Error()) + feedback.Info( + "Tried to import '%s' as dirimp value", + dirimp) } } } diff -r b3b2ba09a450 -r df6c8a485979 pkg/imports/fm_notmrk.go --- a/pkg/imports/fm_notmrk.go Mon Feb 17 18:38:45 2020 +0100 +++ b/pkg/imports/fm_notmrk.go Mon Feb 17 19:00:44 2020 +0100 @@ -195,6 +195,9 @@ }); err != nil { feedback.Warn( pgxutils.ReadableError{Err: err}.Error()) + feedback.Info( + "Tried to import '%s' as dirimp value", + dirimp) } } } diff -r b3b2ba09a450 -r df6c8a485979 pkg/pgxutils/errors.go --- a/pkg/pgxutils/errors.go Mon Feb 17 18:38:45 2020 +0100 +++ b/pkg/pgxutils/errors.go Mon Feb 17 19:00:44 2020 +0100 @@ -98,6 +98,18 @@ return } } + switch err.TableName { + case "fairway_marks_bcnlat_dirimps", + "fairway_marks_daymar_dirimps", + "fairway_marks_notmrk_dirimps": + switch err.ConstraintName { + case "fairway_marks_bcnlat_dirimps_dirimp_fkey", + "fairway_marks_daymar_dirimps_dirimp_fkey", + "fairway_marks_notmrk_dirimps_dirimp_fkey": + m = "Invalid value for dirimp" + return + } + } } case uniqueViolation: switch err.SchemaName {