github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2026-04-15 01:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

altered database code to use repo_host instead of repo_remote

Browse Source
This commit is contained in:
Brad
2014-06-07 13:33:34 -07:00
parent 779987da7f
commit cfed6505d5
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/resource/repo/manager.go
View File

@@ -46,7 +46,7 @@ func (db *repoManager) Find(id int64) (*Repo, error) {
}
func (db *repoManager) FindName(remote, owner, name string) (*Repo, error) {
const query = "select * from repos where repo_remote = ? and repo_owner = ? and repo_name = ?"
const query = "select * from repos where repo_host = ? and repo_owner = ? and repo_name = ?"
var repo = Repo{}
var err = meddler.QueryRow(db, &repo, query, remote, owner, name)
return &repo, err

9
server/resource/repo/manager_test.go
View File

@@ -80,8 +80,8 @@ func TestInsert(t *testing.T) {
}
// verify unique remote + owner + name login constraint
var err = repos.Insert(&Repo{Remote: repo.Remote, Owner: repo.Owner, Name: repo.Name})
if err == nil || !strings.Contains(err.Error(), "repo_remote, repo_owner, repo_name are not unique") {
var err = repos.Insert(&Repo{Host: repo.Host, Owner: repo.Owner, Name: repo.Name})
if err == nil || !strings.Contains(err.Error(), "repo_host, repo_owner, repo_name are not unique") {
t.Errorf("Want unique constraint violated, got %s", err)
}
}
@@ -162,6 +162,11 @@ func testRepo(t *testing.T, repo *Repo) {
t.Errorf("Want Remote %v, got %v", want, got)
}
got, want = repo.Host, "github.com"
if got != want {
t.Errorf("Want Host %v, got %v", want, got)
}
got, want = repo.Owner, "lhofstadter"
if got != want {
t.Errorf("Want Owner %v, got %v", want, got)