mirror of
https://github.com/grafana/grafana.git
synced 2026-08-18 17:15:08 -05:00
Chore: Remove Wrap (#50048)
* Chore: Remove Wrap and Wrapf * Fix: Add error check
This commit is contained in:
@@ -74,7 +74,7 @@ func (mg *Migrator) GetMigrationLog() (map[string]MigrationLog, error) {
|
||||
|
||||
exists, err := mg.DBEngine.IsTableExist(new(MigrationLog))
|
||||
if err != nil {
|
||||
return nil, errutil.Wrap("failed to check table existence", err)
|
||||
return nil, fmt.Errorf("%v: %w", "failed to check table existence", err)
|
||||
}
|
||||
if !exists {
|
||||
return logMap, nil
|
||||
@@ -169,7 +169,7 @@ func (mg *Migrator) run() (err error) {
|
||||
return err
|
||||
})
|
||||
if err != nil {
|
||||
return errutil.Wrap(fmt.Sprintf("migration failed (id = %s)", m.Id()), err)
|
||||
return fmt.Errorf("%v: %w", fmt.Sprintf("migration failed (id = %s)", m.Id()), err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -144,13 +144,13 @@ func (db *MySQLDialect) CleanDB() error {
|
||||
switch table.Name {
|
||||
default:
|
||||
if _, err := sess.Exec("set foreign_key_checks = 0"); err != nil {
|
||||
return errutil.Wrap("failed to disable foreign key checks", err)
|
||||
return fmt.Errorf("%v: %w", "failed to disable foreign key checks", err)
|
||||
}
|
||||
if _, err := sess.Exec("drop table " + table.Name + " ;"); err != nil {
|
||||
return errutil.Wrapf(err, "failed to delete table %q", table.Name)
|
||||
}
|
||||
if _, err := sess.Exec("set foreign_key_checks = 1"); err != nil {
|
||||
return errutil.Wrap("failed to disable foreign key checks", err)
|
||||
return fmt.Errorf("%v: %w", "failed to disable foreign key checks", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,11 +133,11 @@ func (db *PostgresDialect) CleanDB() error {
|
||||
defer sess.Close()
|
||||
|
||||
if _, err := sess.Exec("DROP SCHEMA public CASCADE;"); err != nil {
|
||||
return errutil.Wrap("failed to drop schema public", err)
|
||||
return fmt.Errorf("%v: %w", "failed to drop schema public", err)
|
||||
}
|
||||
|
||||
if _, err := sess.Exec("CREATE SCHEMA public;"); err != nil {
|
||||
return errutil.Wrap("failed to create schema public", err)
|
||||
return fmt.Errorf("%v: %w", "failed to create schema public", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -95,7 +95,7 @@ func newSQLStore(cfg *setting.Cfg, cacheService *localcache.CacheService, engine
|
||||
}
|
||||
|
||||
if err := ss.initEngine(engine); err != nil {
|
||||
return nil, errutil.Wrap("failed to connect to database", err)
|
||||
return nil, fmt.Errorf("%v: %w", "failed to connect to database", err)
|
||||
}
|
||||
|
||||
ss.Dialect = migrator.NewDialect(ss.engine)
|
||||
|
||||
Reference in New Issue
Block a user