diff options
Diffstat (limited to 'internal/db/models.go')
| -rw-r--r-- | internal/db/models.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/internal/db/models.go b/internal/db/models.go index 212a1f60..cf00727e 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -151,8 +151,8 @@ func getEngine() (*xorm.Engine, error) { return xorm.NewEngine(conf.Database.Type, connStr) } -func NewTestEngine(x *xorm.Engine) (err error) { - x, err = getEngine() +func NewTestEngine() error { + x, err := getEngine() if err != nil { return fmt.Errorf("connect to database: %v", err) } @@ -260,8 +260,11 @@ type Version struct { } // DumpDatabase dumps all data from database to file system in JSON format. -func DumpDatabase(dirPath string) (err error) { - os.MkdirAll(dirPath, os.ModePerm) +func DumpDatabase(dirPath string) error { + if err := os.MkdirAll(dirPath, os.ModePerm); err != nil { + return err + } + // Purposely create a local variable to not modify global variable tables := append(tables, new(Version)) for _, table := range tables { @@ -275,10 +278,10 @@ func DumpDatabase(dirPath string) (err error) { if err = x.Asc("id").Iterate(table, func(idx int, bean interface{}) (err error) { return jsoniter.NewEncoder(f).Encode(bean) }); err != nil { - f.Close() + _ = f.Close() return fmt.Errorf("dump table '%s': %v", tableName, err) } - f.Close() + _ = f.Close() } return nil } |