domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix sqlite deadlock when assigning to a PR (#5640)

Browse source 
* Fix sqlite deadlock when assigning to a PR

Fix 5639

Signed-off-by: Andrew Thornton <art27@cantab.net>

* More possible deadlocks found and fixed

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2019-01-04 21:51:27 +00:00 • committed by techknowlogick
parent 9e901039e7
commit 6311e4ce6a
6 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/org.go
View file

@ -393,8 +393,12 @@ func GetOrgUsersByUserID(uid int64, all bool) ([]*OrgUser, error) {
// GetOrgUsersByOrgID returns all organization-user relations by organization ID.
func GetOrgUsersByOrgID(orgID int64) ([]*OrgUser, error) {
return getOrgUsersByOrgID(x, orgID)
}
func getOrgUsersByOrgID(e Engine, orgID int64) ([]*OrgUser, error) {
ous := make([]*OrgUser, 0, 10)
err := x.
err := e.
Where("org_id=?", orgID).
Find(&ous)
return ous, err