diff options
| author | Unknwon <u@gogs.io> | 2015-12-14 02:40:23 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-12-14 02:40:23 -0500 |
| commit | 91789930bcc9d5796a1b06bdeb1402106c0d18d2 (patch) | |
| tree | c2f38efca910d4df435deae7a668881720aaeb10 /models/repo.go | |
| parent | ea375c0dcca118c8ac3c48ba569b025836ad5ccf (diff) | |
| download | gitea-91789930bcc9d5796a1b06bdeb1402106c0d18d2.tar.gz gitea-91789930bcc9d5796a1b06bdeb1402106c0d18d2.zip | |
#2176 fix 500 on /watchers & /stars for pg
Diffstat (limited to 'models/repo.go')
| -rw-r--r-- | models/repo.go | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/models/repo.go b/models/repo.go index 76e381600e..8b6731a72e 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1886,8 +1886,13 @@ func GetWatchers(repoID int64) ([]*Watch, error) { // Repository.GetWatchers returns range of users watching given repository. func (repo *Repository) GetWatchers(page int) ([]*User, error) { users := make([]*User, 0, ItemsPerPage) - return users, x.Limit(ItemsPerPage, (page-1)*ItemsPerPage). - Where("repo_id=?", repo.ID).Join("LEFT", "watch", "user.id=watch.user_id").Find(&users) + sess := x.Limit(ItemsPerPage, (page-1)*ItemsPerPage).Where("watch.repo_id=?", repo.ID) + if setting.UsePostgreSQL { + sess = sess.Join("LEFT", "watch", `"user".id=watch.user_id`) + } else { + sess = sess.Join("LEFT", "watch", "user.id=watch.user_id") + } + return users, sess.Find(&users) } func notifyWatchers(e Engine, act *Action) error { @@ -1969,8 +1974,13 @@ func IsStaring(uid, repoId int64) bool { func (repo *Repository) GetStargazers(page int) ([]*User, error) { users := make([]*User, 0, ItemsPerPage) - return users, x.Limit(ItemsPerPage, (page-1)*ItemsPerPage). - Where("repo_id=?", repo.ID).Join("LEFT", "star", "user.id=star.uid").Find(&users) + sess := x.Limit(ItemsPerPage, (page-1)*ItemsPerPage).Where("star.repo_id=?", repo.ID) + if setting.UsePostgreSQL { + sess = sess.Join("LEFT", "star", `"user".id=star.uid`) + } else { + sess = sess.Join("LEFT", "star", "user.id=star.uid") + } + return users, sess.Find(&users) } // ___________ __ |