Backport #11925 Use ID or Where to instead directly use Get when load object from database Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>tags/v1.11.7
@@ -136,9 +136,8 @@ func GetAttachmentByID(id int64) (*Attachment, error) { | |||
} | |||
func getAttachmentByID(e Engine, id int64) (*Attachment, error) { | |||
attach := &Attachment{ID: id} | |||
if has, err := e.Get(attach); err != nil { | |||
attach := &Attachment{} | |||
if has, err := e.ID(id).Get(attach); err != nil { | |||
return nil, err | |||
} else if !has { | |||
return nil, ErrAttachmentNotExist{ID: id, UUID: ""} | |||
@@ -147,8 +146,8 @@ func getAttachmentByID(e Engine, id int64) (*Attachment, error) { | |||
} | |||
func getAttachmentByUUID(e Engine, uuid string) (*Attachment, error) { | |||
attach := &Attachment{UUID: uuid} | |||
has, err := e.Get(attach) | |||
attach := &Attachment{} | |||
has, err := e.Where("uuid=?", uuid).Get(attach) | |||
if err != nil { | |||
return nil, err | |||
} else if !has { |
@@ -231,8 +231,8 @@ func getProtectedBranchBy(e Engine, repoID int64, branchName string) (*Protected | |||
// GetProtectedBranchByID getting protected branch by ID | |||
func GetProtectedBranchByID(id int64) (*ProtectedBranch, error) { | |||
rel := &ProtectedBranch{ID: id} | |||
has, err := x.Get(rel) | |||
rel := &ProtectedBranch{} | |||
has, err := x.ID(id).Get(rel) | |||
if err != nil { | |||
return nil, err | |||
} | |||
@@ -521,9 +521,9 @@ func (repo *Repository) GetDeletedBranches() ([]*DeletedBranch, error) { | |||
} | |||
// GetDeletedBranchByID get a deleted branch by its ID | |||
func (repo *Repository) GetDeletedBranchByID(ID int64) (*DeletedBranch, error) { | |||
deletedBranch := &DeletedBranch{ID: ID} | |||
has, err := x.Get(deletedBranch) | |||
func (repo *Repository) GetDeletedBranchByID(id int64) (*DeletedBranch, error) { | |||
deletedBranch := &DeletedBranch{} | |||
has, err := x.ID(id).Get(deletedBranch) | |||
if err != nil { | |||
return nil, err | |||
} |
@@ -212,11 +212,8 @@ func getLabelInRepoByName(e Engine, repoID int64, labelName string) (*Label, err | |||
return nil, ErrLabelNotExist{0, repoID} | |||
} | |||
l := &Label{ | |||
Name: labelName, | |||
RepoID: repoID, | |||
} | |||
has, err := e.Get(l) | |||
l := &Label{} | |||
has, err := e.Where("name=? AND repo_id=?", labelName, repoID).Get(l) | |||
if err != nil { | |||
return nil, err | |||
} else if !has { |
@@ -300,7 +300,7 @@ func (source *LoginSource) SSPI() *SSPIConfig { | |||
// CreateLoginSource inserts a LoginSource in the DB if not already | |||
// existing with the given name. | |||
func CreateLoginSource(source *LoginSource) error { | |||
has, err := x.Get(&LoginSource{Name: source.Name}) | |||
has, err := x.Where("name=?", source.Name).Exist(new(LoginSource)) | |||
if err != nil { | |||
return err | |||
} else if has { |
@@ -142,8 +142,8 @@ func UpdateTwoFactor(t *TwoFactor) error { | |||
// GetTwoFactorByUID returns the two-factor authentication token associated with | |||
// the user, if any. | |||
func GetTwoFactorByUID(uid int64) (*TwoFactor, error) { | |||
twofa := &TwoFactor{UID: uid} | |||
has, err := x.Get(twofa) | |||
twofa := &TwoFactor{} | |||
has, err := x.Where("uid=?", uid).Get(twofa) | |||
if err != nil { | |||
return nil, err | |||
} else if !has { |
@@ -76,8 +76,8 @@ func NewUpload(name string, buf []byte, file multipart.File) (_ *Upload, err err | |||
// GetUploadByUUID returns the Upload by UUID | |||
func GetUploadByUUID(uuid string) (*Upload, error) { | |||
upload := &Upload{UUID: uuid} | |||
has, err := x.Get(upload) | |||
upload := &Upload{} | |||
has, err := x.Where("uuid=?", uuid).Get(upload) | |||
if err != nil { | |||
return nil, err | |||
} else if !has { |
@@ -1457,8 +1457,8 @@ func GetUserByEmail(email string) (*User, error) { | |||
// Finally, if email address is the protected email address: | |||
if strings.HasSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) { | |||
username := strings.TrimSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) | |||
user := &User{LowerName: username} | |||
has, err := x.Get(user) | |||
user := &User{} | |||
has, err := x.Where("lower_name=?", username).Get(user) | |||
if err != nil { | |||
return nil, err | |||
} |
@@ -71,8 +71,8 @@ func GetEmailAddresses(uid int64) ([]*EmailAddress, error) { | |||
// GetEmailAddressByID gets a user's email address by ID | |||
func GetEmailAddressByID(uid, id int64) (*EmailAddress, error) { | |||
// User ID is required for security reasons | |||
email := &EmailAddress{ID: id, UID: uid} | |||
if has, err := x.Get(email); err != nil { | |||
email := &EmailAddress{UID: uid} | |||
if has, err := x.ID(id).Get(email); err != nil { | |||
return nil, err | |||
} else if !has { | |||
return nil, nil | |||
@@ -126,7 +126,7 @@ func isEmailUsed(e Engine, email string) (bool, error) { | |||
return true, nil | |||
} | |||
return e.Get(&EmailAddress{Email: email}) | |||
return e.Where("email=?", email).Get(&EmailAddress{}) | |||
} | |||
// IsEmailUsed returns true if the email has been used. | |||
@@ -251,8 +251,8 @@ func MakeEmailPrimary(email *EmailAddress) error { | |||
return ErrEmailNotActivated | |||
} | |||
user := &User{ID: email.UID} | |||
has, err = x.Get(user) | |||
user := &User{} | |||
has, err = x.ID(email.UID).Get(user) | |||
if err != nil { | |||
return err | |||
} else if !has { |
@@ -111,8 +111,8 @@ func GetUserByOpenID(uri string) (*User, error) { | |||
log.Trace("Normalized OpenID URI: " + uri) | |||
// Otherwise, check in openid table | |||
oid := &UserOpenID{URI: uri} | |||
has, err := x.Get(oid) | |||
oid := &UserOpenID{} | |||
has, err := x.Where("uri=?", uri).Get(oid) | |||
if err != nil { | |||
return nil, err | |||
} |