Skip to content

Commit 885cd08

Browse files
committed
chore: move sorting to db execution with OrderBy
1 parent b7de62b commit 885cd08

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

models/packages/package_file.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TryInsertFile(ctx context.Context, pf *PackageFile) (*PackageFile, error) {
6868
// GetFilesByVersionID gets all files of a version
6969
func GetFilesByVersionID(ctx context.Context, versionID int64) ([]*PackageFile, error) {
7070
pfs := make([]*PackageFile, 0, 10)
71-
return pfs, db.GetEngine(ctx).Where("version_id = ?", versionID).Find(&pfs)
71+
return pfs, db.GetEngine(ctx).OrderBy("id").Where("version_id = ?", versionID).Find(&pfs)
7272
}
7373

7474
// GetFileForVersionByID gets a file of a version by id

tests/integration/api_packages_generic_test.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"fmt"
99
"io"
1010
"net/http"
11-
"sort"
1211
"testing"
1312

1413
"code.gitea.io/gitea/models/packages"
@@ -121,17 +120,12 @@ func TestPackageGeneric(t *testing.T) {
121120
assert.Equal(t, packageVersion, resPkg.Version)
122121
assert.Equal(t, int64(0), resPkg.DownloadCount)
123122

124-
// json results are ordered differently in different db engines for some reason
125-
sort.Slice(resPkg.Files, func(i, j int) bool {
126-
return resPkg.Files[i].Name < resPkg.Files[j].Name
127-
})
128-
129123
resFile1 := resPkg.Files[0]
130-
assert.Equal(t, "dummy.bin", resFile1.Name)
124+
assert.Equal(t, filename, resFile1.Name)
131125
assert.LessOrEqual(t, timestamp, resFile1.CreatedUnix)
132126

133127
resFile2 := resPkg.Files[1]
134-
assert.Equal(t, filename, resFile2.Name)
128+
assert.Equal(t, "dummy.bin", resFile2.Name)
135129
assert.LessOrEqual(t, timestamp, resFile2.CreatedUnix)
136130
})
137131

0 commit comments

Comments
 (0)