mirror of https://github.com/gogs/gogs.git
db: use gorm function to check `ErrRecordNotFound` (#6060)
parent
4aff4d66ec
commit
3a5c93eeff
|
@ -52,7 +52,7 @@ func (db *accessTokens) GetBySHA(sha string) (*AccessToken, error) {
|
|||
token := new(AccessToken)
|
||||
err := db.Where("sha1 = ?", sha).First(token).Error
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
if gorm.IsRecordNotFoundError(err) {
|
||||
return nil, ErrAccessTokenNotExist{args: errutil.Args{"sha": sha}}
|
||||
}
|
||||
return nil, err
|
||||
|
|
|
@ -107,7 +107,7 @@ func (db *lfs) GetObjectByOID(repoID int64, oid lfsutil.OID) (*LFSObject, error)
|
|||
object := new(LFSObject)
|
||||
err := db.Where("repo_id = ? AND oid = ?", repoID, oid).First(object).Error
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
if gorm.IsRecordNotFoundError(err) {
|
||||
return nil, ErrLFSObjectNotExist{args: errutil.Args{"repoID": repoID, "oid": oid}}
|
||||
}
|
||||
return nil, err
|
||||
|
|
|
@ -27,7 +27,7 @@ func (db *loginSources) GetByID(id int64) (*LoginSource, error) {
|
|||
source := new(LoginSource)
|
||||
err := db.Where("id = ?", id).First(source).Error
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
if gorm.IsRecordNotFoundError(err) {
|
||||
return localLoginSources.GetLoginSourceByID(id)
|
||||
}
|
||||
return nil, err
|
||||
|
|
|
@ -29,7 +29,7 @@ func (db *repos) GetByName(ownerID int64, name string) (*Repository, error) {
|
|||
repo := new(Repository)
|
||||
err := db.Where("owner_id = ? AND lower_name = ?", ownerID, strings.ToLower(name)).First(repo).Error
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
if gorm.IsRecordNotFoundError(err) {
|
||||
return nil, ErrRepoNotExist{args: map[string]interface{}{"ownerID": ownerID, "name": name}}
|
||||
}
|
||||
return nil, err
|
||||
|
|
|
@ -117,7 +117,7 @@ func (db *users) GetByID(id int64) (*User, error) {
|
|||
user := new(User)
|
||||
err := db.Where("id = ?", id).First(user).Error
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
if gorm.IsRecordNotFoundError(err) {
|
||||
return nil, ErrUserNotExist{args: map[string]interface{}{"userID": id}}
|
||||
}
|
||||
return nil, err
|
||||
|
@ -129,7 +129,7 @@ func (db *users) GetByUsername(username string) (*User, error) {
|
|||
user := new(User)
|
||||
err := db.Where("lower_name = ?", strings.ToLower(username)).First(user).Error
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
if gorm.IsRecordNotFoundError(err) {
|
||||
return nil, ErrUserNotExist{args: map[string]interface{}{"name": username}}
|
||||
}
|
||||
return nil, err
|
||||
|
|
Loading…
Reference in New Issue