Skip to content

Commit 9355bbc

Browse files
committed
fix CI build
1 parent 7832a9a commit 9355bbc

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

models/migrations/v95.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"code.gitea.io/gitea/models"
1111
"code.gitea.io/gitea/modules/setting"
12+
1213
"github.com/go-xorm/xorm"
1314
)
1415

@@ -25,8 +26,8 @@ func deleteOrphanedAttachments(x *xorm.Engine) error {
2526
sess := x.NewSession()
2627
defer sess.Close()
2728

28-
err := sess.BufferSize(setting.IterateBufferSize).
29-
Where("`comment_id` = 0 and (`release_id` = 0 or `release_id` not in (select `id` from `releases`))").Cols("uuid").
29+
err := sess.BufferSize(setting.Database.IterateBufferSize).
30+
Where("`comment_id` = 0 and (`release_id` = 0 or `release_id` not in (select `id` from `release`))").Cols("uuid").
3031
Iterate(new(Attachment),
3132
func(idx int, bean interface{}) error {
3233
attachment := bean.(*Attachment)

models/release.go

+12-13
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,17 @@ func DeleteReleaseByID(id int64, doer *User, delTag bool) error {
358358
return fmt.Errorf("LoadAttributes: %v", err)
359359
}
360360

361+
if _, err := x.Delete(&Attachment{ReleaseID: id}); err != nil {
362+
return err
363+
}
364+
365+
for i := range rel.Attachments {
366+
attachment := rel.Attachments[i]
367+
if err := os.RemoveAll(attachment.LocalPath()); err != nil {
368+
return err
369+
}
370+
}
371+
361372
mode, _ := AccessLevel(doer, rel.Repo)
362373
if err := PrepareWebhooks(rel.Repo, HookEventRelease, &api.ReleasePayload{
363374
Action: api.HookReleaseDeleted,
@@ -370,19 +381,7 @@ func DeleteReleaseByID(id int64, doer *User, delTag bool) error {
370381
go HookQueue.Add(rel.Repo.ID)
371382
}
372383

373-
uuids := make([]string, 0, len(rel.Attachments))
374-
375-
for i := range rel.Attachments {
376-
attachment := rel.Attachments[i]
377-
if err := os.RemoveAll(attachment.LocalPath()); err != nil {
378-
return err
379-
}
380-
381-
uuids = append(uuids, attachment.UUID)
382-
}
383-
384-
_, err := x.Delete(&Attachment{ReleaseID: id})
385-
return err
384+
return nil
386385
}
387386

388387
// SyncReleasesWithTags synchronizes release table with repository tags

0 commit comments

Comments
 (0)