Skip to content

use in instead string join #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2016
Merged

use in instead string join #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions models/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion models/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions models/issue_label.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})")
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
3 changes: 1 addition & 2 deletions models/ssh_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down