USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

db: use gorm function to check `ErrRecordNotFound` (#6060)

pull/6062/head
ᴜɴᴋɴᴡᴏɴ 2020-04-05 00:56:31 +08:00 committed by GitHub
parent 4aff4d66ec
commit 3a5c93eeff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/db/access_tokens.go
View File

@ -52,7 +52,7 @@ func (db *accessTokens) GetBySHA(sha string) (*AccessToken, error) {
token := new(AccessToken) token := new(AccessToken)
err := db.Where("sha1 = ?", sha).First(token).Error err := db.Where("sha1 = ?", sha).First(token).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound { if gorm.IsRecordNotFoundError(err) {
return nil, ErrAccessTokenNotExist{args: errutil.Args{"sha": sha}} return nil, ErrAccessTokenNotExist{args: errutil.Args{"sha": sha}}
} }
return nil, err return nil, err

2
internal/db/lfs.go
View File

@ -107,7 +107,7 @@ func (db *lfs) GetObjectByOID(repoID int64, oid lfsutil.OID) (*LFSObject, error)
object := new(LFSObject) object := new(LFSObject)
err := db.Where("repo_id = ? AND oid = ?", repoID, oid).First(object).Error err := db.Where("repo_id = ? AND oid = ?", repoID, oid).First(object).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound { if gorm.IsRecordNotFoundError(err) {
return nil, ErrLFSObjectNotExist{args: errutil.Args{"repoID": repoID, "oid": oid}} return nil, ErrLFSObjectNotExist{args: errutil.Args{"repoID": repoID, "oid": oid}}
} }
return nil, err return nil, err

2
internal/db/login_sources.go
View File

@ -27,7 +27,7 @@ func (db *loginSources) GetByID(id int64) (*LoginSource, error) {
source := new(LoginSource) source := new(LoginSource)
err := db.Where("id = ?", id).First(source).Error err := db.Where("id = ?", id).First(source).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound { if gorm.IsRecordNotFoundError(err) {
return localLoginSources.GetLoginSourceByID(id) return localLoginSources.GetLoginSourceByID(id)
} }
return nil, err return nil, err

2
internal/db/repos.go
View File

@ -29,7 +29,7 @@ func (db *repos) GetByName(ownerID int64, name string) (*Repository, error) {
repo := new(Repository) repo := new(Repository)
err := db.Where("owner_id = ? AND lower_name = ?", ownerID, strings.ToLower(name)).First(repo).Error err := db.Where("owner_id = ? AND lower_name = ?", ownerID, strings.ToLower(name)).First(repo).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound { if gorm.IsRecordNotFoundError(err) {
return nil, ErrRepoNotExist{args: map[string]interface{}{"ownerID": ownerID, "name": name}} return nil, ErrRepoNotExist{args: map[string]interface{}{"ownerID": ownerID, "name": name}}
} }
return nil, err return nil, err

4
internal/db/users.go
View File

@ -117,7 +117,7 @@ func (db *users) GetByID(id int64) (*User, error) {
user := new(User) user := new(User)
err := db.Where("id = ?", id).First(user).Error err := db.Where("id = ?", id).First(user).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound { if gorm.IsRecordNotFoundError(err) {
return nil, ErrUserNotExist{args: map[string]interface{}{"userID": id}} return nil, ErrUserNotExist{args: map[string]interface{}{"userID": id}}
} }
return nil, err return nil, err
@ -129,7 +129,7 @@ func (db *users) GetByUsername(username string) (*User, error) {
user := new(User) user := new(User)
err := db.Where("lower_name = ?", strings.ToLower(username)).First(user).Error err := db.Where("lower_name = ?", strings.ToLower(username)).First(user).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound { if gorm.IsRecordNotFoundError(err) {
return nil, ErrUserNotExist{args: map[string]interface{}{"name": username}} return nil, ErrUserNotExist{args: map[string]interface{}{"name": username}}
} }
return nil, err return nil, err