Skip to content

Commit 900f233

Browse files
authored
Merge pull request #152 from lunny/lunny/optimization_in
optimization on database IN
2 parents 9bf28a2 + ade6d4a commit 900f233

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

models/org.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import (
1010
"os"
1111
"strings"
1212

13+
"github.com/go-xorm/builder"
1314
"github.com/go-xorm/xorm"
14-
15-
"code.gitea.io/gitea/modules/base"
1615
)
1716

1817
var (
@@ -540,7 +539,7 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos
540539
Select("`repository`.*").
541540
Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id").
542541
Where("(`repository`.owner_id=? AND `repository`.is_private=?)", org.ID, false).
543-
Or("team_repo.team_id IN (?)", strings.Join(base.Int64sToStrings(teamIDs), ",")).
542+
Or(builder.In("team_repo.team_id", teamIDs)).
544543
GroupBy("`repository`.id").
545544
OrderBy("updated_unix DESC").
546545
Limit(pageSize, (page-1)*pageSize).
@@ -551,7 +550,7 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos
551550
repoCount, err := x.
552551
Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id").
553552
Where("(`repository`.owner_id=? AND `repository`.is_private=?)", org.ID, false).
554-
Or("team_repo.team_id IN (?)", strings.Join(base.Int64sToStrings(teamIDs), ",")).
553+
Or(builder.In("team_repo.team_id", teamIDs)).
555554
GroupBy("`repository`.id").
556555
Count(&Repository{})
557556
if err != nil {
@@ -577,7 +576,7 @@ func (org *User) GetUserMirrorRepositories(userID int64) ([]*Repository, error)
577576
Select("`repository`.*").
578577
Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id AND `repository`.is_mirror=?", true).
579578
Where("(`repository`.owner_id=? AND `repository`.is_private=?)", org.ID, false).
580-
Or("team_repo.team_id IN (?)", strings.Join(base.Int64sToStrings(teamIDs), ",")).
579+
Or(builder.In("team_repo.team_id", teamIDs)).
581580
GroupBy("`repository`.id").
582581
OrderBy("updated_unix DESC").
583582
Find(&repos)

0 commit comments

Comments
 (0)