rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-08-13 03:55:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix the ListOptions sort field.

Browse Source 
Instead of making it a single array-ish field, convert it into a
true array of Sort Directives.  Easier to read, less bending backwards.
This commit is contained in:
Eric Promislow 2025-04-24 14:57:32 -07:00
parent ec49b857fa
commit a0d591a9b5
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/sqlcache/informer/listoption_indexer.go
View File

@ -6,7 +6,6 @@ import (
"encoding/gob" "encoding/gob"
"errors" "errors"
"fmt" "fmt"
"github.com/rancher/steve/pkg/sqlcache/sqltypes"
"regexp" "regexp"
"sort" "sort"
"strconv" "strconv"

21
pkg/sqlcache/informer/listoption_indexer_test.go
View File

@ -817,27 +817,6 @@ func TestListByOptions(t *testing.T) {
expectedErr: nil, expectedErr: nil,
}) })
tests = append(tests, testCase{
description: "ListByOptions sorting when # fields != # sort orders should return an error",
listOptions: sqltypes.ListOptions{
Sort: sqltypes.Sort{
Fields: [][]string{{"metadata", "somefield"}, {"status", "someotherfield"}},
Orders: []sqltypes.SortOrder{sqltypes.DESC, sqltypes.ASC, sqltypes.ASC},
},
},
partitions: []partition.Partition{},
ns: "",
expectedStmt: `SELECT o.object, o.objectnonce, o.dekid FROM "something" o
JOIN "something_fields" f ON o.key = f.key
WHERE
(FALSE)
ORDER BY f."metadata.somefield" DESC, f."status.someotherfield" ASC`,
returnList: []any{&unstructured.Unstructured{Object: unstrTestObjectMap}, &unstructured.Unstructured{Object: unstrTestObjectMap}},
expectedList: &unstructured.UnstructuredList{Object: map[string]interface{}{"items": []map[string]interface{}{unstrTestObjectMap, unstrTestObjectMap}}, Items: []unstructured.Unstructured{{Object: unstrTestObjectMap}, {Object: unstrTestObjectMap}}},
expectedContToken: "",
expectedErr: fmt.Errorf("sort fields length 2 != sort orders length 3"),
})
tests = append(tests, testCase{ tests = append(tests, testCase{
description: "ListByOptions with Pagination.PageSize set should set limit to PageSize in prepared sql.Stmt", description: "ListByOptions with Pagination.PageSize set should set limit to PageSize in prepared sql.Stmt",
listOptions: sqltypes.ListOptions{ listOptions: sqltypes.ListOptions{

10
pkg/sqlcache/sqltypes/types.go
View File

@ -65,10 +65,6 @@ type SortList struct {
SortDirectives []Sort SortDirectives []Sort
} }
type SortList struct {
SortDirectives []Sort
}
// Pagination represents how to return paginated results. // Pagination represents how to return paginated results.
type Pagination struct { type Pagination struct {
PageSize int PageSize int
@ -80,9 +76,3 @@ func NewSortList() *SortList {
SortDirectives: []Sort{}, SortDirectives: []Sort{},
} }
} }
func NewSortList() *SortList {
return &SortList{
SortDirectives: []Sort{},
}
}