From 0868fc815fa9fb6251e86be39bed8b306872a012 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sat, 23 Jan 2021 20:07:17 +0800 Subject: [PATCH] fix(region): exported number of vpcs less than listed --- pkg/compute/models/vpcs.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index 885906cddc..73145e1abd 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -1454,7 +1454,7 @@ func (manager *SVpcManager) ListItemExportKeys(ctx context.Context, if keys.Contains("wire_count") { wires := WireManager.Query("vpc_id").SubQuery() subq := wires.Query(sqlchemy.COUNT("wire_count"), wires.Field("vpc_id")).GroupBy(wires.Field("vpc_id")).SubQuery() - q = q.Join(subq, sqlchemy.Equals(q.Field("id"), subq.Field("vpc_id"))) + q = q.LeftJoin(subq, sqlchemy.Equals(q.Field("id"), subq.Field("vpc_id"))) q = q.AppendField(subq.Field("wire_count")) } @@ -1462,10 +1462,10 @@ func (manager *SVpcManager) ListItemExportKeys(ctx context.Context, wires := WireManager.Query("id", "vpc_id").SubQuery() networks := NetworkManager.Query("wire_id").SubQuery() subq := networks.Query(sqlchemy.COUNT("network_count"), wires.Field("vpc_id")) - subq = subq.Join(wires, sqlchemy.Equals(networks.Field("wire_id"), wires.Field("id"))) + subq = subq.LeftJoin(wires, sqlchemy.Equals(networks.Field("wire_id"), wires.Field("id"))) subq = subq.GroupBy(wires.Field("vpc_id")) subqQ := subq.SubQuery() - q = q.Join(subqQ, sqlchemy.Equals(q.Field("id"), subqQ.Field("vpc_id"))) + q = q.LeftJoin(subqQ, sqlchemy.Equals(q.Field("id"), subqQ.Field("vpc_id"))) q = q.AppendField(subqQ.Field("network_count")) }