From d975b8038bc473cd2600f74a76d7d948c0486fbd Mon Sep 17 00:00:00 2001 From: Saeid Saeidee Date: Tue, 21 Feb 2023 17:12:14 +0100 Subject: [PATCH] style: applied styler --- errtranslator/mssql.go | 33 --------------------------------- errtranslator/mysql.go | 33 --------------------------------- errtranslator/postgres.go | 34 ---------------------------------- errtranslator/sqlite.go | 34 ---------------------------------- errtranslator/types.go | 16 ---------------- tests/error_translator_test.go | 2 +- 6 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 errtranslator/mssql.go delete mode 100644 errtranslator/mysql.go delete mode 100644 errtranslator/postgres.go delete mode 100644 errtranslator/sqlite.go delete mode 100644 errtranslator/types.go diff --git a/errtranslator/mssql.go b/errtranslator/mssql.go deleted file mode 100644 index 7bce4d0c..00000000 --- a/errtranslator/mssql.go +++ /dev/null @@ -1,33 +0,0 @@ -package errtranslator - -import "encoding/json" - -var mssqlErrCodes = map[string]int{ - "uniqueConstraint": 2627, -} - -type MssqlErrTranslator struct{} - -type MssqlErr struct { - Number int `json:"Number"` - Message string `json:"Message"` -} - -func (m *MssqlErrTranslator) Translate(err error) error { - parsedErr, marshalErr := json.Marshal(err) - if marshalErr != nil { - return err - } - - var mssqlErr MssqlErr - unmarshalErr := json.Unmarshal(parsedErr, &mssqlErr) - if unmarshalErr != nil { - return err - } - - if mssqlErr.Number == mssqlErrCodes["uniqueConstraint"] { - return ErrDuplicatedKey{Code: mssqlErr.Number, Message: mssqlErr.Message} - } - - return err -} diff --git a/errtranslator/mysql.go b/errtranslator/mysql.go deleted file mode 100644 index 9f3800a9..00000000 --- a/errtranslator/mysql.go +++ /dev/null @@ -1,33 +0,0 @@ -package errtranslator - -import "encoding/json" - -var mysqlErrCodes = map[string]int{ - "uniqueConstraint": 1062, -} - -type MysqlErrTranslator struct{} - -type MysqlErr struct { - Number int `json:"Number"` - Message string `json:"Message"` -} - -func (m *MysqlErrTranslator) Translate(err error) error { - parsedErr, marshalErr := json.Marshal(err) - if marshalErr != nil { - return err - } - - var mysqlErr MysqlErr - unmarshalErr := json.Unmarshal(parsedErr, &mysqlErr) - if unmarshalErr != nil { - return err - } - - if mysqlErr.Number == mysqlErrCodes["uniqueConstraint"] { - return ErrDuplicatedKey{Code: mysqlErr.Number, Message: mysqlErr.Message} - } - - return err -} diff --git a/errtranslator/postgres.go b/errtranslator/postgres.go deleted file mode 100644 index 22b7d193..00000000 --- a/errtranslator/postgres.go +++ /dev/null @@ -1,34 +0,0 @@ -package errtranslator - -import "encoding/json" - -var postgresErrCodes = map[string]string{ - "uniqueConstraint": "23505", -} - -type PostgresErrTranslator struct{} - -type PostgresErr struct { - Code string `json:"Code"` - Severity string `json:"Severity"` - Message string `json:"Message"` -} - -func (p *PostgresErrTranslator) Translate(err error) error { - parsedErr, marshalErr := json.Marshal(err) - if marshalErr != nil { - return err - } - - var postgresErr PostgresErr - unmarshalErr := json.Unmarshal(parsedErr, &postgresErr) - if unmarshalErr != nil { - return err - } - - if postgresErr.Code == postgresErrCodes["uniqueConstraint"] { - return ErrDuplicatedKey{Code: postgresErr.Code, Message: postgresErr.Message} - } - - return err -} diff --git a/errtranslator/sqlite.go b/errtranslator/sqlite.go deleted file mode 100644 index 4bece997..00000000 --- a/errtranslator/sqlite.go +++ /dev/null @@ -1,34 +0,0 @@ -package errtranslator - -import "encoding/json" - -var sqliteErrCodes = map[string]int{ - "uniqueConstraint": 2067, -} - -type SqliteErrTranslator struct{} - -type SqliteErr struct { - Code int `json:"Code"` - ExtendedCode int `json:"ExtendedCode"` - SystemErrno int `json:"SystemErrno"` -} - -func (s *SqliteErrTranslator) Translate(err error) error { - parsedErr, marshalErr := json.Marshal(err) - if marshalErr != nil { - return err - } - - var sqliteErr SqliteErr - unmarshalErr := json.Unmarshal(parsedErr, &sqliteErr) - if unmarshalErr != nil { - return err - } - - if sqliteErr.ExtendedCode == sqliteErrCodes["uniqueConstraint"] { - return ErrDuplicatedKey{Code: sqliteErr.ExtendedCode, Message: ""} - } - - return err -} diff --git a/errtranslator/types.go b/errtranslator/types.go deleted file mode 100644 index 9a0eae57..00000000 --- a/errtranslator/types.go +++ /dev/null @@ -1,16 +0,0 @@ -package errtranslator - -import "fmt" - -type ErrTranslator interface { - Translate(err error) error -} - -type ErrDuplicatedKey struct { - Code interface{} - Message string -} - -func (e ErrDuplicatedKey) Error() string { - return fmt.Sprintf("duplicated key not allowed, code: %v, message: %s", e.Code, e.Message) -} diff --git a/tests/error_translator_test.go b/tests/error_translator_test.go index 9aaab9d3..2e472e34 100644 --- a/tests/error_translator_test.go +++ b/tests/error_translator_test.go @@ -10,7 +10,7 @@ import ( func TestDialectorWithErrorTranslatorSupport(t *testing.T) { translatedErr := errors.New("translated error") - var db, _ = gorm.Open(tests.DummyDialector{TranslatedErr: translatedErr}) + db, _ := gorm.Open(tests.DummyDialector{TranslatedErr: translatedErr}) err := db.AddError(errors.New("some random error")) if !errors.Is(err, translatedErr) {