pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

use in instead string join (#155)

Browse source
This commit is contained in:
Lunny Xiao 2016-11-12 16:29:18 +08:00 committed by Thibault Meyer
parent 555d8b16cb
commit 30a37311f8
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
models/admin.go
View file

@ -14,7 +14,6 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
) )
@ -131,7 +130,7 @@ func DeleteNoticesByIDs(ids []int64) error {
return nil return nil
} }
_, err := x. _, err := x.
Where("id IN (" + strings.Join(base.Int64sToStrings(ids), ",") + ")"). In("id", ids).
Delete(new(Notice)) Delete(new(Notice))
return err return err
} }

2
models/issue.go
View file

@ -829,7 +829,7 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
return make([]*Issue, 0), nil return make([]*Issue, 0), nil
} }
sess. sess.
In("issue.repo_id", base.Int64sToStrings(opts.RepoIDs)). In("issue.repo_id", opts.RepoIDs).
And("issue.is_closed=?", opts.IsClosed) And("issue.is_closed=?", opts.IsClosed)
} else { } else {
sess.Where("issue.is_closed=?", opts.IsClosed) sess.Where("issue.is_closed=?", opts.IsClosed)

6
models/issue_label.go
View file

@ -14,8 +14,6 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
api "code.gitea.io/sdk/gitea" api "code.gitea.io/sdk/gitea"
"code.gitea.io/gitea/modules/base"
) )
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})") var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
@ -140,7 +138,7 @@ func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
labels := make([]*Label, 0, len(labelIDs)) labels := make([]*Label, 0, len(labelIDs))
return labels, x. return labels, x.
Where("repo_id = ?", repoID). Where("repo_id = ?", repoID).
In("id", base.Int64sToStrings(labelIDs)). In("id", labelIDs).
Asc("name"). Asc("name").
Find(&labels) Find(&labels)
} }
@ -170,7 +168,7 @@ func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
labels := make([]*Label, 0, len(labelIDs)) labels := make([]*Label, 0, len(labelIDs))
return labels, e. return labels, e.
Where("id > 0"). Where("id > 0").
In("id", base.Int64sToStrings(labelIDs)). In("id", labelIDs).
Asc("name"). Asc("name").
Find(&labels) Find(&labels)
} }

3
models/ssh_key.go
View file

@ -22,7 +22,6 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
@ -476,7 +475,7 @@ func deletePublicKeys(e *xorm.Session, keyIDs ...int64) error {
return nil return nil
} }
_, err := e.In("id", strings.Join(base.Int64sToStrings(keyIDs), ",")).Delete(new(PublicKey)) _, err := e.In("id", keyIDs).Delete(new(PublicKey))
return err return err
} }