From db876b44807e485e29fd072a8f3ecd7fca92085f Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Tue, 27 Jul 2021 01:16:47 +0800 Subject: [PATCH] fix: simplify SQL for distinct field query of tenant or domain names --- pkg/cloudcommon/db/domain.go | 2 +- pkg/cloudcommon/db/project.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cloudcommon/db/domain.go b/pkg/cloudcommon/db/domain.go index f4ac19763f..f419874e3f 100644 --- a/pkg/cloudcommon/db/domain.go +++ b/pkg/cloudcommon/db/domain.go @@ -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 diff --git a/pkg/cloudcommon/db/project.go b/pkg/cloudcommon/db/project.go index 02c86b3ee3..fa4577adad 100644 --- a/pkg/cloudcommon/db/project.go +++ b/pkg/cloudcommon/db/project.go @@ -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