diff options
author | Unknwon <u@gogs.io> | 2016-03-09 23:18:39 -0500 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2016-03-09 23:18:39 -0500 |
commit | eed9966ad6cb2e6b0828733ab50cc133f16fc332 (patch) | |
tree | e8ab645d1a9daf10512c4fec10f1ee2f548b5fda | |
parent | ad513a20e939691828ba415c9a565e8ff3daa95f (diff) | |
download | gitea-eed9966ad6cb2e6b0828733ab50cc133f16fc332.tar.gz gitea-eed9966ad6cb2e6b0828733ab50cc133f16fc332.zip |
#2727 fix incompatible SQL in PostgreSQL
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | gogs.go | 2 | ||||
-rw-r--r-- | models/org.go | 7 | ||||
-rw-r--r-- | modules/middleware/org.go | 2 | ||||
-rw-r--r-- | templates/.VERSION | 2 |
5 files changed, 7 insertions, 8 deletions
@@ -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.9.2 +##### Current version: 0.9.3 | Web | UI | Preview | |:-------------:|:-------:|:-------:| @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.2.0309" +const APP_VER = "0.9.3.0309" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/org.go b/models/org.go index 1fee4f522d..c2665902ad 100644 --- a/models/org.go +++ b/models/org.go @@ -1071,11 +1071,10 @@ WHERE team_user.org_id = ? AND team_user.uid = ?`, org.Id, userID).Find(&teams); } repos := make([]*Repository, 0, 5) - if err = x.Sql(`SELECT repository.* FROM repository + if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository INNER JOIN team_repo ON team_repo.repo_id = repository.id -WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (?) -GROUP BY repository.id`, - org.Id, false, strings.Join(teamIDs, ",")).Find(&repos); err != nil { +WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s) +GROUP BY repository.id`, strings.Join(teamIDs, ",")), org.Id, false).Find(&repos); err != nil { return fmt.Errorf("get repositories: %v", err) } org.Repos = repos diff --git a/modules/middleware/org.go b/modules/middleware/org.go index e62e0b0b01..eec2b556fd 100644 --- a/modules/middleware/org.go +++ b/modules/middleware/org.go @@ -90,7 +90,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { if ctx.Org.IsMember { if ctx.Org.IsOwner { if err := org.GetTeams(); err != nil { - ctx.Handle(500, "GetUserTeams", err) + ctx.Handle(500, "GetTeams", err) return } } else { diff --git a/templates/.VERSION b/templates/.VERSION index f78748364a..572d3528cc 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.2.0309
\ No newline at end of file +0.9.3.0309
\ No newline at end of file |