From 97429a25ab6a0cef263edf85124bae73c5457b9c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 1 Mar 2016 14:39:28 -0500 Subject: [PATCH] #2727 make IN clause compatible with Postgres --- README.md | 2 +- gogs.go | 2 +- models/org.go | 6 +++--- templates/.VERSION | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dc1c50ead0..bbae77cd8d 100644 --- a/README.md +++ b/README.md @@ -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) -##### Current version: 0.8.49 +##### Current version: 0.8.50 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/gogs.go b/gogs.go index dc571b6012..c57dd2bdd2 100644 --- a/gogs.go +++ b/gogs.go @@ -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