Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

#2727 make IN clause compatible with Postgres

Browse source
This commit is contained in:
Unknwon 2016-03-01 14:39:28 -05:00
parent 9e89584cb4
commit 97429a25ab
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current version: 0.8.49 ##### Current version: 0.8.50
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.8.49.0229" const APP_VER = "0.8.50.0301"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

6
models/org.go
View file

@ -1060,7 +1060,7 @@ func (org *User) GetUserRepositories(userID int64) (err error) {
And("`team_user`.uid=?", userID). And("`team_user`.uid=?", userID).
Join("INNER", "`team_user`", "`team_user`.team_id=`team`.id"). Join("INNER", "`team_user`", "`team_user`.team_id=`team`.id").
Find(&teams); err != nil { Find(&teams); err != nil {
return fmt.Errorf("GetUserRepositories: get teams: %v", err) return fmt.Errorf("get teams: %v", err)
} }
teamIDs := make([]string, len(teams)) teamIDs := make([]string, len(teams))
@ -1080,10 +1080,10 @@ func (org *User) GetUserRepositories(userID int64) (err error) {
Join("INNER", "`team_repo`", "`team_repo`.repo_id=`repository`.id"). Join("INNER", "`team_repo`", "`team_repo`.repo_id=`repository`.id").
Where("`repository`.owner_id=?", org.Id). Where("`repository`.owner_id=?", org.Id).
And("`repository`.is_private=?", false). And("`repository`.is_private=?", false).
Or("`team_repo`.team_id=(?)", strings.Join(teamIDs, ",")). Or("`team_repo`.team_id IN (?)", strings.Join(teamIDs, ",")).
GroupBy("`repository`.id"). GroupBy("`repository`.id").
Find(&org.Repos); err != nil { Find(&org.Repos); err != nil {
return fmt.Errorf("GetUserRepositories: get repositories: %v", err) return fmt.Errorf("get repositories: %v", err)
} }
// FIXME: should I change this value inside method, // FIXME: should I change this value inside method,

2
templates/.VERSION
View file

@ -1 +1 @@
0.8.49.0229 0.8.50.0301