Skip to content

Commit 30a3731

Browse files
lunny0xBAADF00D
authored andcommitted
use in instead string join (#155)
1 parent 555d8b1 commit 30a3731

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

models/admin.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/Unknwon/com"
1515
"github.com/go-xorm/xorm"
1616

17-
"code.gitea.io/gitea/modules/base"
1817
"code.gitea.io/gitea/modules/log"
1918
"code.gitea.io/gitea/modules/setting"
2019
)
@@ -131,7 +130,7 @@ func DeleteNoticesByIDs(ids []int64) error {
131130
return nil
132131
}
133132
_, err := x.
134-
Where("id IN (" + strings.Join(base.Int64sToStrings(ids), ",") + ")").
133+
In("id", ids).
135134
Delete(new(Notice))
136135
return err
137136
}

models/issue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
829829
return make([]*Issue, 0), nil
830830
}
831831
sess.
832-
In("issue.repo_id", base.Int64sToStrings(opts.RepoIDs)).
832+
In("issue.repo_id", opts.RepoIDs).
833833
And("issue.is_closed=?", opts.IsClosed)
834834
} else {
835835
sess.Where("issue.is_closed=?", opts.IsClosed)

models/issue_label.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"github.com/go-xorm/xorm"
1515

1616
api "code.gitea.io/sdk/gitea"
17-
18-
"code.gitea.io/gitea/modules/base"
1917
)
2018

2119
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
@@ -140,7 +138,7 @@ func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
140138
labels := make([]*Label, 0, len(labelIDs))
141139
return labels, x.
142140
Where("repo_id = ?", repoID).
143-
In("id", base.Int64sToStrings(labelIDs)).
141+
In("id", labelIDs).
144142
Asc("name").
145143
Find(&labels)
146144
}
@@ -170,7 +168,7 @@ func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
170168
labels := make([]*Label, 0, len(labelIDs))
171169
return labels, e.
172170
Where("id > 0").
173-
In("id", base.Int64sToStrings(labelIDs)).
171+
In("id", labelIDs).
174172
Asc("name").
175173
Find(&labels)
176174
}

models/ssh_key.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/go-xorm/xorm"
2323
"golang.org/x/crypto/ssh"
2424

25-
"code.gitea.io/gitea/modules/base"
2625
"code.gitea.io/gitea/modules/log"
2726
"code.gitea.io/gitea/modules/process"
2827
"code.gitea.io/gitea/modules/setting"
@@ -476,7 +475,7 @@ func deletePublicKeys(e *xorm.Session, keyIDs ...int64) error {
476475
return nil
477476
}
478477

479-
_, err := e.In("id", strings.Join(base.Int64sToStrings(keyIDs), ",")).Delete(new(PublicKey))
478+
_, err := e.In("id", keyIDs).Delete(new(PublicKey))
480479
return err
481480
}
482481

0 commit comments

Comments
 (0)