thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Fix delete-orphaned-repos (#28200) (#28202)

Browse source 
Backport #28200

gitea doctor failed at checking and fixing 'delete-orphaned-repos',
because table name 'user' needs quoting to be correctly recognized by at
least PostgreSQL.

fixes #28199
This commit is contained in:
pitpalme 2023-11-24 20:54:14 +01:00 committed by GitHub
parent 28b8e0b43e
commit 7cae4dfc00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/doctor/repository.go
View file

@ -26,7 +26,7 @@ func handleDeleteOrphanedRepos(ctx context.Context, logger log.Logger, autofix b
// countOrphanedRepos count repository where user of owner_id do not exist // countOrphanedRepos count repository where user of owner_id do not exist
func countOrphanedRepos(ctx context.Context) (int64, error) { func countOrphanedRepos(ctx context.Context) (int64, error) {
return db.CountOrphanedObjects(ctx, "repository", "user", "repository.owner_id=user.id") return db.CountOrphanedObjects(ctx, "repository", "user", "repository.owner_id=`user`.id")
} }
// deleteOrphanedRepos delete repository where user of owner_id do not exist // deleteOrphanedRepos delete repository where user of owner_id do not exist
@ -39,7 +39,7 @@ func deleteOrphanedRepos(ctx context.Context) (int64, error) {
for { for {
var ids []int64 var ids []int64
if err := e.Table("`repository`"). if err := e.Table("`repository`").
Join("LEFT", "`user`", "repository.owner_id=user.id"). Join("LEFT", "`user`", "repository.owner_id=`user`.id").
Where(builder.IsNull{"`user`.id"}). Where(builder.IsNull{"`user`.id"}).
Select("`repository`.id").Limit(batchSize).Find(&ids); err != nil { Select("`repository`.id").Limit(batchSize).Find(&ids); err != nil {
return deleted, err return deleted, err