Browse Source

use in instead string join (#155)

tags/v1.0.0
Lunny Xiao 7 years ago
parent
commit
30a37311f8
4 changed files with 5 additions and 9 deletions
  1. 1
    2
      models/admin.go
  2. 1
    1
      models/issue.go
  3. 2
    4
      models/issue_label.go
  4. 1
    2
      models/ssh_key.go

+ 1
- 2
models/admin.go View File

"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"
) )
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
} }

+ 1
- 1
models/issue.go View File

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)

+ 2
- 4
models/issue_label.go View File

"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})")
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)
} }
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)
} }

+ 1
- 2
models/ssh_key.go View File

"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"
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
} }



Loading…
Cancel
Save