diff options
author | Unknwon <u@gogs.io> | 2016-03-01 14:39:28 -0500 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2016-03-01 14:39:28 -0500 |
commit | 97429a25ab6a0cef263edf85124bae73c5457b9c (patch) | |
tree | 63a021e7560755ac0984e9580703ceb7894e0c63 | |
parent | 9e89584cb4aa6321311dd291c364c5d956fcead1 (diff) | |
download | gitea-97429a25ab6a0cef263edf85124bae73c5457b9c.tar.gz gitea-97429a25ab6a0cef263edf85124bae73c5457b9c.zip |
#2727 make IN clause compatible with Postgres
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | gogs.go | 2 | ||||
-rw-r--r-- | models/org.go | 6 | ||||
-rw-r--r-- | templates/.VERSION | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -3,7 +3,7 @@ Gogs - Go Git Service [ -##### Current version: 0.8.49 +##### Current version: 0.8.50 | Web | UI | Preview | |:-------------:|:-------:|:-------:| @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.49.0229" +const APP_VER = "0.8.50.0301" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/org.go b/models/org.go index 9d86df1027..f70d182c7b 100644 --- a/models/org.go +++ b/models/org.go @@ -1060,7 +1060,7 @@ func (org *User) GetUserRepositories(userID int64) (err error) { And("`team_user`.uid=?", userID). Join("INNER", "`team_user`", "`team_user`.team_id=`team`.id"). Find(&teams); err != nil { - return fmt.Errorf("GetUserRepositories: get teams: %v", err) + return fmt.Errorf("get teams: %v", err) } 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"). Where("`repository`.owner_id=?", org.Id). 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"). 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, diff --git a/templates/.VERSION b/templates/.VERSION index 0b07e5dcaa..7052ac3fdc 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.49.0229
\ No newline at end of file +0.8.50.0301
\ No newline at end of file |