Don't add duplicated error

dimandzhi · Aug 18, 2015 · 81c00fd · 81c00fd
1 parent 24aeec7
commit 81c00fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/errors.go b/errors.go
@@ -26,7 +26,18 @@ func (errs Errors) GetErrors() []error {
 }
 
 func (errs *Errors) Add(err error) {
-	errs.errors = append(errs.errors, err)
+	if errors, ok := err.(errorsInterface); ok {
+		for _, err := range errors.GetErrors() {
+			errs.Add(err)
+		}
+	} else {
+		for _, e := range errs.errors {
+			if err == e {
+				return
+			}
+		}
+		errs.errors = append(errs.errors, err)
+	}
 }
 
 func (errs Errors) Error() string {

diff --git a/main.go b/main.go
@@ -518,10 +518,10 @@ func (s *DB) AddError(err error) error {
 				s.log(err)
 			}
 
-			if e, ok := err.(errorsInterface); ok {
-				err = Errors{errors: append(s.GetErrors(), e.GetErrors()...)}
-			} else {
-				err = Errors{errors: append(s.GetErrors(), err)}
+			errors := Errors{errors: s.GetErrors()}
+			errors.Add(err)
+			if len(errors.GetErrors()) > 1 {
+				err = errors
 			}
 		}