aboutsummaryrefslogtreecommitdiff
path: root/internal/db/models.go
diff options
context:
space:
mode:
authorᴜɴᴋɴᴡᴏɴ <u@gogs.io>2020-03-21 13:39:32 +0800
committerGitHub <noreply@github.com>2020-03-21 13:39:32 +0800
commit5843038a0812cc133c1895b7410aeda7153e8708 (patch)
tree3515998242443e1a82217ee4702603819c5315c8 /internal/db/models.go
parent958d8b6bb4c2da66859325695b91d871e567a4fa (diff)
workflows: enable golangci-lint (#5998)
* Create golint.yml * Update golint.yml * Update golint.yml * Fix errcheck * Fix gosimple * Fix staticcheck
Diffstat (limited to 'internal/db/models.go')
-rw-r--r--internal/db/models.go15
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
}