Skip to content

Commit

Permalink
Fix db.Find bug (#23115) (#23119)
Browse files Browse the repository at this point in the history
Backport #23115

Caused by #20821 

Fix #23110
  • Loading branch information
yardenshoham authored Feb 24, 2023
1 parent e02e752 commit 27e3071
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 2 deletions.
4 changes: 2 additions & 2 deletions models/db/list_options.go → models/db/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func Find[T any](ctx context.Context, opts FindOptions, objects *[]T) error {
if !opts.IsListAll() {
sess.Limit(opts.GetSkipTake())
}
return sess.Find(&objects)
return sess.Find(objects)
}

// Count represents a common count function which accept an options interface
Expand All @@ -148,5 +148,5 @@ func FindAndCount[T any](ctx context.Context, opts FindOptions, objects *[]T) (i
if !opts.IsListAll() {
sess.Limit(opts.GetSkipTake())
}
return sess.FindAndCount(&objects)
return sess.FindAndCount(objects)
}
48 changes: 48 additions & 0 deletions models/db/list_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

package db_test

import (
"testing"

"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"

"github.com/stretchr/testify/assert"
"xorm.io/builder"
)

type mockListOptions struct {
db.ListOptions
}

func (opts *mockListOptions) IsListAll() bool {
return true
}

func (opts *mockListOptions) ToConds() builder.Cond {
return builder.NewCond()
}

func TestFind(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
xe := unittest.GetXORMEngine()
assert.NoError(t, xe.Sync(&repo_model.RepoUnit{}))

opts := mockListOptions{}
var repoUnits []repo_model.RepoUnit
err := db.Find(db.DefaultContext, &opts, &repoUnits)
assert.NoError(t, err)
assert.EqualValues(t, 83, len(repoUnits))

cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit))
assert.NoError(t, err)
assert.EqualValues(t, 83, cnt)

repoUnits = make([]repo_model.RepoUnit, 0, 10)
newCnt, err := db.FindAndCount(db.DefaultContext, &opts, &repoUnits)
assert.NoError(t, err)
assert.EqualValues(t, cnt, newCnt)
}

0 comments on commit 27e3071

Please sign in to comment.