use in instead string join (#155)
This commit is contained in:
parent
555d8b16cb
commit
30a37311f8
4 changed files with 5 additions and 9 deletions
|
@ -14,7 +14,6 @@ import (
|
|||
"github.com/Unknwon/com"
|
||||
"github.com/go-xorm/xorm"
|
||||
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
)
|
||||
|
@ -131,7 +130,7 @@ func DeleteNoticesByIDs(ids []int64) error {
|
|||
return nil
|
||||
}
|
||||
_, err := x.
|
||||
Where("id IN (" + strings.Join(base.Int64sToStrings(ids), ",") + ")").
|
||||
In("id", ids).
|
||||
Delete(new(Notice))
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -829,7 +829,7 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
|
|||
return make([]*Issue, 0), nil
|
||||
}
|
||||
sess.
|
||||
In("issue.repo_id", base.Int64sToStrings(opts.RepoIDs)).
|
||||
In("issue.repo_id", opts.RepoIDs).
|
||||
And("issue.is_closed=?", opts.IsClosed)
|
||||
} else {
|
||||
sess.Where("issue.is_closed=?", opts.IsClosed)
|
||||
|
|
|
@ -14,8 +14,6 @@ import (
|
|||
"github.com/go-xorm/xorm"
|
||||
|
||||
api "code.gitea.io/sdk/gitea"
|
||||
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
)
|
||||
|
||||
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))
|
||||
return labels, x.
|
||||
Where("repo_id = ?", repoID).
|
||||
In("id", base.Int64sToStrings(labelIDs)).
|
||||
In("id", labelIDs).
|
||||
Asc("name").
|
||||
Find(&labels)
|
||||
}
|
||||
|
@ -170,7 +168,7 @@ func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
|
|||
labels := make([]*Label, 0, len(labelIDs))
|
||||
return labels, e.
|
||||
Where("id > 0").
|
||||
In("id", base.Int64sToStrings(labelIDs)).
|
||||
In("id", labelIDs).
|
||||
Asc("name").
|
||||
Find(&labels)
|
||||
}
|
||||
|
|
|
@ -22,7 +22,6 @@ import (
|
|||
"github.com/go-xorm/xorm"
|
||||
"golang.org/x/crypto/ssh"
|
||||
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/process"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
|
@ -476,7 +475,7 @@ func deletePublicKeys(e *xorm.Session, keyIDs ...int64) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
_, err := e.In("id", strings.Join(base.Int64sToStrings(keyIDs), ",")).Delete(new(PublicKey))
|
||||
_, err := e.In("id", keyIDs).Delete(new(PublicKey))
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue