opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2280 from wanyaoqi/feature/wyq/vpc-distinct-field-add-manager

Browse Source 
feature: vpc add distinct field manager
This commit is contained in:
yunion-ci-robot
2019-08-15 10:36:03 +08:00
committed by GitHub
parent f7abd82d4a e1c921cf25
commit ceace185bb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/vpcs.go
+5
View File
@@ -683,6 +683,11 @@ func (manager *SVpcManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field st
q = q.Join(cloudaccounts, sqlchemy.Equals(cloudproviders.Field("cloudaccount_id"), cloudaccounts.Field("id")))
q.GroupBy(cloudaccounts.Field("name"))
q.AppendField(cloudaccounts.Field("name", "account"))
case "manager":
cloudproviders := CloudproviderManager.Query("name", "id").Distinct().SubQuery()
q = q.Join(cloudproviders, sqlchemy.Equals(q.Field("manager_id"), cloudproviders.Field("id")))
q.GroupBy(cloudproviders.Field("name"))
q.AppendField(cloudproviders.Field("name", "manager"))
default:
return nil, httperrors.NewBadRequestError("unsupport field %s", field)
}