opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11730 from swordqiu/automated-cherry-pick-of-#11729-upstream-release-3.7

Browse Source 
Automated cherry pick of #11729: fix: simplify SQL for distinct field query of tenant or domain names
This commit is contained in:
Zexi Li
2021-07-27 10:29:43 +08:00
committed by GitHub
parent f630133ab3 db876b4480
commit a0058edc16
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/domain.go
+1 -1
View File
@@ -91,7 +91,7 @@ func ValidateCreateDomainId(domainId string) error {
func (manager *SDomainizedResourceBaseManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
switch field {
case "domain":
tenantCacheQuery := TenantCacheManager.GetDomainQuery("name", "id").SubQuery()
tenantCacheQuery := TenantCacheManager.getTable() // GetDomainQuery("name", "id").SubQuery()
q = q.AppendField(tenantCacheQuery.Field("name", "domain")).Distinct()
q = q.Join(tenantCacheQuery, sqlchemy.Equals(q.Field("domain_id"), tenantCacheQuery.Field("id")))
return q, nil
pkg/cloudcommon/db/project.go
+1 -1
View File
@@ -77,7 +77,7 @@ func (manager *SProjectizedResourceBaseManager) FetchOwnerId(ctx context.Context
func (manager *SProjectizedResourceBaseManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
switch field {
case "tenant":
tenantCacheQuery := TenantCacheManager.GetTenantQuery("name", "id").Distinct().SubQuery()
tenantCacheQuery := TenantCacheManager.getTable() // GetTenantQuery("name", "id").Distinct().SubQuery()
q.AppendField(tenantCacheQuery.Field("name", "tenant")).Distinct()
q = q.Join(tenantCacheQuery, sqlchemy.Equals(q.Field("tenant_id"), tenantCacheQuery.Field("id")))
return q, nil