diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-19 21:40:42 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-19 21:40:42 +0800 |
commit | e422342eebc18034ef586ec58f1e2fff0340091d (patch) | |
tree | 307264b46c1683915429083d54e9634ee4f2fc4d /models/db | |
parent | 01214c8ada993bf5f54a4149979d140443d69410 (diff) | |
download | gitea-e422342eebc18034ef586ec58f1e2fff0340091d.tar.gz gitea-e422342eebc18034ef586ec58f1e2fff0340091d.zip |
Allow adding new files to an empty repo (#24164)
![image](https://user-images.githubusercontent.com/2114189/232561612-2bfcfd0a-fc04-47ba-965f-5d0bcea46c54.png)
Diffstat (limited to 'models/db')
-rw-r--r-- | models/db/iterate_test.go | 11 | ||||
-rw-r--r-- | models/db/list_test.go | 11 |
2 files changed, 15 insertions, 7 deletions
diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go index f9f1213721..5362f34075 100644 --- a/models/db/iterate_test.go +++ b/models/db/iterate_test.go @@ -19,13 +19,16 @@ func TestIterate(t *testing.T) { xe := unittest.GetXORMEngine() assert.NoError(t, xe.Sync(&repo_model.RepoUnit{})) - var repoCnt int - err := db.Iterate(db.DefaultContext, nil, func(ctx context.Context, repo *repo_model.RepoUnit) error { - repoCnt++ + cnt, err := db.GetEngine(db.DefaultContext).Count(&repo_model.RepoUnit{}) + assert.NoError(t, err) + + var repoUnitCnt int + err = db.Iterate(db.DefaultContext, nil, func(ctx context.Context, repo *repo_model.RepoUnit) error { + repoUnitCnt++ return nil }) assert.NoError(t, err) - assert.EqualValues(t, 89, repoCnt) + assert.EqualValues(t, cnt, repoUnitCnt) err = db.Iterate(db.DefaultContext, nil, func(ctx context.Context, repoUnit *repo_model.RepoUnit) error { reopUnit2 := repo_model.RepoUnit{ID: repoUnit.ID} diff --git a/models/db/list_test.go b/models/db/list_test.go index 195450b1e7..6b9bebd64b 100644 --- a/models/db/list_test.go +++ b/models/db/list_test.go @@ -31,15 +31,20 @@ func TestFind(t *testing.T) { xe := unittest.GetXORMEngine() assert.NoError(t, xe.Sync(&repo_model.RepoUnit{})) + var repoUnitCount int + _, err := db.GetEngine(db.DefaultContext).SQL("SELECT COUNT(*) FROM repo_unit").Get(&repoUnitCount) + assert.NoError(t, err) + assert.NotEmpty(t, repoUnitCount) + opts := mockListOptions{} var repoUnits []repo_model.RepoUnit - err := db.Find(db.DefaultContext, &opts, &repoUnits) + err = db.Find(db.DefaultContext, &opts, &repoUnits) assert.NoError(t, err) - assert.EqualValues(t, 89, len(repoUnits)) + assert.EqualValues(t, repoUnitCount, len(repoUnits)) cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit)) assert.NoError(t, err) - assert.EqualValues(t, 89, cnt) + assert.EqualValues(t, repoUnitCount, cnt) repoUnits = make([]repo_model.RepoUnit, 0, 10) newCnt, err := db.FindAndCount(db.DefaultContext, &opts, &repoUnits) |