diff options
| author | Nanguan Lin <70063547+lng2020@users.noreply.github.com> | 2023-10-19 18:25:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-19 10:25:57 +0000 |
| commit | e91d4f106b1f97abb06f3af9506f00a730357f9e (patch) | |
| tree | 400625abf49deea2ba5d37d787592716c91a71c3 | |
| parent | 2f2ca8c940a8d79426ac0ea2e2c61727ebd6204a (diff) | |
| download | gitea-e91d4f106b1f97abb06f3af9506f00a730357f9e.tar.gz gitea-e91d4f106b1f97abb06f3af9506f00a730357f9e.zip | |
Upgrade xorm (#27673)
Related to https://gitea.com/xorm/xorm/pulls/2341
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rw-r--r-- | models/git/commit_status.go | 2 | ||||
| -rw-r--r-- | models/unittest/unit_tests.go | 10 |
4 files changed, 13 insertions, 5 deletions
@@ -121,7 +121,7 @@ require ( mvdan.cc/xurls/v2 v2.5.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.13 - xorm.io/xorm v1.3.3 + xorm.io/xorm v1.3.4-0.20231017094142-dbe499091a7e ) require ( @@ -1648,5 +1648,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1: xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo= xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= -xorm.io/xorm v1.3.3 h1:L5/GOhvgMcwJYYRjzPf3lTTTf6JcaTd1Mb9A/Iqvccw= -xorm.io/xorm v1.3.3/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo= +xorm.io/xorm v1.3.4-0.20231017094142-dbe499091a7e h1:oL+ktEW+iSrCXU6IauJ9csZFATEmawkhsq/MAoHTdwo= +xorm.io/xorm v1.3.4-0.20231017094142-dbe499091a7e/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo= diff --git a/models/git/commit_status.go b/models/git/commit_status.go index acb0110200..c6a52bcd9f 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -235,7 +235,7 @@ func GetCommitStatuses(ctx context.Context, repo *repo_model.Repository, sha str countSession := listCommitStatusesStatement(ctx, repo, sha, opts) countSession = db.SetSessionPagination(countSession, opts) - maxResults, err := countSession.Count(new(CommitStatus)) + maxResults, err := countSession.OrderBy("1").Count(new(CommitStatus)) if err != nil { log.Error("Count PRs: %v", err) return nil, maxResults, err diff --git a/models/unittest/unit_tests.go b/models/unittest/unit_tests.go index 399040580c..d47bceea1e 100644 --- a/models/unittest/unit_tests.go +++ b/models/unittest/unit_tests.go @@ -96,7 +96,15 @@ func AssertExistsAndLoadMap(t assert.TestingT, table string, conditions ...any) // GetCount get the count of a bean func GetCount(t assert.TestingT, bean any, conditions ...any) int { e := db.GetEngine(db.DefaultContext) - count, err := whereOrderConditions(e, conditions).Count(bean) + for _, condition := range conditions { + switch cond := condition.(type) { + case *testCond: + e = e.Where(cond.query, cond.args...) + default: + e = e.Where(cond) + } + } + count, err := e.Count(bean) assert.NoError(t, err) return int(count) } |