Remove duplicated sort fields from order by clause (#19347)

In MustClone() it will set Sorts field twice, that will generate two duplicated order by fields in the generated SQL. Signed-off-by: bin liu <[email protected]>
goharbor · Sep 16, 2023 · 26a4f6e · 26a4f6e
1 parent ed370a4
commit 26a4f6e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/lib/q/query.go b/src/lib/q/query.go
@@ -56,7 +56,6 @@ func MustClone(query *Query) *Query {
 	if query != nil {
 		q.PageNumber = query.PageNumber
 		q.PageSize = query.PageSize
-		q.Sorts = query.Sorts
 		for k, v := range query.Keywords {
 			q.Keywords[k] = v
 		}

diff --git a/src/lib/q/query_test.go b/src/lib/q/query_test.go
@@ -30,6 +30,7 @@ func TestMustClone(t *testing.T) {
 	}{
 		{"ptr", args{New(KeyWords{"public": "true"})}, New(KeyWords{"public": "true"})},
 		{"nil", args{nil}, New(KeyWords{})},
+		{"sort", args{&Query{Keywords: KeyWords{"public": "true"}, Sorts: []*Sort{NewSort("col-1", true)}}}, &Query{Keywords: KeyWords{"public": "true"}, Sorts: []*Sort{NewSort("col-1", true)}}},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {