Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-26 00:31:58 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug #4791

Browse Source 
Remove the table join when querying repositories with project name
This commit is contained in:
Wenkai Yin 2017-12-19 17:02:20 +08:00
parent befd169c00
commit 8d62d989a5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/dao/repository.go
View File

@ -135,6 +135,7 @@ func GetRepositories(query ...*models.RepositoryQuery) ([]*models.RepoRecord, er
if _, err := GetOrmer().Raw(sql, params).QueryRows(&repositories); err != nil { if _, err := GetOrmer().Raw(sql, params).QueryRows(&repositories); err != nil {
return nil, err return nil, err
} }
return repositories, nil return repositories, nil
} }
@ -145,9 +146,6 @@ func repositoryQueryConditions(query ...*models.RepositoryQuery) (string, []inte
return sql, params return sql, params
} }
q := query[0] q := query[0]
if len(q.ProjectName) > 0 {
sql += `join project p on r.project_id = p.project_id `
}
if q.LabelID > 0 { if q.LabelID > 0 {
sql += `join harbor_resource_label rl on r.repository_id = rl.resource_id sql += `join harbor_resource_label rl on r.repository_id = rl.resource_id
@ -167,8 +165,10 @@ func repositoryQueryConditions(query ...*models.RepositoryQuery) (string, []inte
} }
if len(q.ProjectName) > 0 { if len(q.ProjectName) > 0 {
sql += `and p.name = ? ` // use "like" rather than "table joining" because that
params = append(params, q.ProjectName) // in integration mode the projects are saved in Admiral side
sql += `and r.name like ? `
params = append(params, q.ProjectName+"/%")
} }
if q.LabelID > 0 { if q.LabelID > 0 {