Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2026-05-07 06:15:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace pkg/errors with cockroachdb/errors (#8098)

Browse Source 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: unknwon <2946214+unknwon@users.noreply.github.com>
This commit is contained in:
Copilot
2026-01-22 08:20:53 -05:00
committed by GitHub
parent ae59787ff5
commit 4ee706b2bf
96 changed files with 605 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/database/models.go
View File

@@ -10,7 +10,7 @@ import (
"strings"
"time"
"github.com/pkg/errors"
"github.com/cockroachdb/errors"
"gorm.io/gorm"
"gorm.io/gorm/logger"
log "unknwon.dev/clog/v2"
@@ -97,13 +97,13 @@ func getEngine() (*xorm.Engine, error) {
case "sqlite3":
if err := os.MkdirAll(path.Dir(conf.Database.Path), os.ModePerm); err != nil {
return nil, fmt.Errorf("create directories: %v", err)
return nil, errors.Newf("create directories: %v", err)
}
conf.UseSQLite3 = true
connStr = "file:" + conf.Database.Path + "?cache=shared&mode=rwc"
default:
return nil, fmt.Errorf("unknown database type: %s", conf.Database.Type)
return nil, errors.Newf("unknown database type: %s", conf.Database.Type)
}
return xorm.NewEngine(driver, connStr)
}
@@ -111,7 +111,7 @@ func getEngine() (*xorm.Engine, error) {
func NewTestEngine() error {
x, err := getEngine()
if err != nil {
return fmt.Errorf("connect to database: %v", err)
return errors.Newf("connect to database: %v", err)
}
if conf.UsePostgreSQL {
@@ -126,7 +126,7 @@ func SetEngine() (*gorm.DB, error) {
var err error
x, err = getEngine()
if err != nil {
return nil, fmt.Errorf("connect to database: %v", err)
return nil, errors.Newf("connect to database: %v", err)
}
if conf.UsePostgreSQL {
@@ -151,7 +151,7 @@ func SetEngine() (*gorm.DB, error) {
},
)
if err != nil {
return nil, fmt.Errorf("create 'xorm.log': %v", err)
return nil, errors.Newf("create 'xorm.log': %v", err)
}
x.SetMaxOpenConns(conf.Database.MaxOpenConns)
@@ -184,7 +184,7 @@ func NewEngine() error {
}
if err = migrations.Migrate(db); err != nil {
return fmt.Errorf("migrate: %v", err)
return errors.Newf("migrate: %v", err)
}
if err = x.StoreEngine("InnoDB").Sync2(legacyTables...); err != nil {