fix(region): distinct fields (#20356)

yunionio · May 24, 2024 · 803584d · 803584d
1 parent a216a37
commit 803584d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/cloudcommon/db/modelbase.go b/pkg/cloudcommon/db/modelbase.go
@@ -513,7 +513,7 @@ func (manager *SModelBaseManager) GetPropertyDistinctFields(ctx context.Context,
 	result := jsonutils.NewDict()
 	fields := jsonutils.NewArray()
 	if len(input.Field) > 0 {
-		sq := q.Copy()
+		sq := q.Copy().ResetFields()
 		// query field
 		for i := 0; i < len(input.Field); i++ {
 			sq = sq.AppendField(sq.Field(input.Field[i]))
@@ -536,7 +536,7 @@ func (manager *SModelBaseManager) GetPropertyDistinctFields(ctx context.Context,
 	extraFields := jsonutils.NewArray()
 	if len(input.ExtraResource) > 0 && len(input.ExtraField) > 0 {
 		// query extra field
-		sq := q.Copy()
+		sq := q.Copy().ResetFields()
 		em := GetModelManager(input.ExtraResource)
 		if gotypes.IsNil(em) {
 			return nil, httperrors.NewInputParameterError("invalid extra_resource %s", input.ExtraResource)

diff --git a/vendor/yunion.io/x/sqlchemy/query.go b/vendor/yunion.io/x/sqlchemy/query.go