lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Delete protected branch if repository gets removed (#15658) 

* Added missing error parameters.

* Delete protected branch if repository gets removed.

* Added doctor fix.
release/v1.15
KN4CK3R 2021-04-30 00:48:52 +02:00 committed by GitHub
parent d576126286
commit 2e85165349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/repo.go
View File

@ -1472,6 +1472,7 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
&LanguageStat{RepoID: repoID}, &LanguageStat{RepoID: repoID},
&Comment{RefRepoID: repoID}, &Comment{RefRepoID: repoID},
&Task{RepoID: repoID}, &Task{RepoID: repoID},
&ProtectedBranch{RepoID: repoID},
); err != nil { ); err != nil {
return fmt.Errorf("deleteBeans: %v", err) return fmt.Errorf("deleteBeans: %v", err)
} }

34
modules/doctor/dbconsistency.go
View File

@ -29,7 +29,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if count > 0 { if count > 0 {
if autofix { if autofix {
if err = models.DeleteOrphanedLabels(); err != nil { if err = models.DeleteOrphanedLabels(); err != nil {
logger.Critical("Error: %v whilst deleting orphaned labels") logger.Critical("Error: %v whilst deleting orphaned labels", err)
return err return err
} }
logger.Info("%d labels without existing repository/organisation deleted", count) logger.Info("%d labels without existing repository/organisation deleted", count)
@ -47,7 +47,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if count > 0 { if count > 0 {
if autofix { if autofix {
if err = models.DeleteOrphanedIssueLabels(); err != nil { if err = models.DeleteOrphanedIssueLabels(); err != nil {
logger.Critical("Error: %v whilst deleting orphaned issue_labels") logger.Critical("Error: %v whilst deleting orphaned issue_labels", err)
return err return err
} }
logger.Info("%d issue_labels without existing label deleted", count) logger.Info("%d issue_labels without existing label deleted", count)
@ -65,7 +65,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if count > 0 { if count > 0 {
if autofix { if autofix {
if err = models.DeleteOrphanedIssues(); err != nil { if err = models.DeleteOrphanedIssues(); err != nil {
logger.Critical("Error: %v whilst deleting orphaned issues") logger.Critical("Error: %v whilst deleting orphaned issues", err)
return err return err
} }
logger.Info("%d issues without existing repository deleted", count) logger.Info("%d issues without existing repository deleted", count)
@ -83,7 +83,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if count > 0 { if count > 0 {
if autofix { if autofix {
if err = models.DeleteOrphanedObjects("pull_request", "issue", "pull_request.issue_id=issue.id"); err != nil { if err = models.DeleteOrphanedObjects("pull_request", "issue", "pull_request.issue_id=issue.id"); err != nil {
logger.Critical("Error: %v whilst deleting orphaned objects") logger.Critical("Error: %v whilst deleting orphaned objects", err)
return err return err
} }
logger.Info("%d pull requests without existing issue deleted", count) logger.Info("%d pull requests without existing issue deleted", count)
@ -101,7 +101,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if count > 0 { if count > 0 {
if autofix { if autofix {
if err = models.DeleteOrphanedObjects("tracked_time", "issue", "tracked_time.issue_id=issue.id"); err != nil { if err = models.DeleteOrphanedObjects("tracked_time", "issue", "tracked_time.issue_id=issue.id"); err != nil {
logger.Critical("Error: %v whilst deleting orphaned objects") logger.Critical("Error: %v whilst deleting orphaned objects", err)
return err return err
} }
logger.Info("%d tracked times without existing issue deleted", count) logger.Info("%d tracked times without existing issue deleted", count)
@ -120,7 +120,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if autofix { if autofix {
updatedCount, err := models.FixNullArchivedRepository() updatedCount, err := models.FixNullArchivedRepository()
if err != nil { if err != nil {
logger.Critical("Error: %v whilst fixing null archived repositories") logger.Critical("Error: %v whilst fixing null archived repositories", err)
return err return err
} }
logger.Info("%d repositories with null is_archived updated", updatedCount) logger.Info("%d repositories with null is_archived updated", updatedCount)
@ -139,7 +139,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if autofix { if autofix {
updatedCount, err := models.FixCommentTypeLabelWithEmptyLabel() updatedCount, err := models.FixCommentTypeLabelWithEmptyLabel()
if err != nil { if err != nil {
logger.Critical("Error: %v whilst removing label comments with empty labels") logger.Critical("Error: %v whilst removing label comments with empty labels", err)
return err return err
} }
logger.Info("%d label comments with empty labels removed", updatedCount) logger.Info("%d label comments with empty labels removed", updatedCount)
@ -197,7 +197,7 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
if autofix { if autofix {
err := models.FixBadSequences() err := models.FixBadSequences()
if err != nil { if err != nil {
logger.Critical("Error: %v whilst attempting to fix sequences") logger.Critical("Error: %v whilst attempting to fix sequences", err)
return err return err
} }
logger.Info("%d sequences updated", count) logger.Info("%d sequences updated", count)
@ -207,6 +207,24 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
} }
} }
// find protected branches without existing repository
count, err = models.CountOrphanedObjects("protected_branch", "repository", "protected_branch.repo_id=repository.id")
if err != nil {
logger.Critical("Error: %v whilst counting orphaned objects")
return err
}
if count > 0 {
if autofix {
if err = models.DeleteOrphanedObjects("protected_branch", "repository", "protected_branch.repo_id=repository.id"); err != nil {
logger.Critical("Error: %v whilst deleting orphaned objects", err)
return err
}
logger.Info("%d protected branches without existing repository deleted", count)
} else {
logger.Warn("%d protected branches without existing repository", count)
}
}
return nil return nil
} }