Rename UpdateRepositoryCols -> UpdateRepositoryColsWithoutAutoTime

lunny · lunny · commit 967f20ccdb25 · 2025-05-09T16:16:35.000-07:00
diff --git a/models/repo/update.go b/models/repo/update.go
@@ -34,15 +34,15 @@ func UpdateRepositoryOwnerNames(ctx context.Context, ownerID int64, ownerName st
 	return committer.Commit()
 }
 
-// UpdateRepositoryUpdatedTime updates a repository's updated time
-func UpdateRepositoryUpdatedTime(ctx context.Context, repoID int64, updateTime time.Time) error {
-	_, err := db.GetEngine(ctx).Exec("UPDATE repository SET updated_unix = ? WHERE id = ?", updateTime.Unix(), repoID)
+// UpdateRepositoryColsWithAutoTime updates repository's columns
+func UpdateRepositoryColsWithAutoTime(ctx context.Context, repo *Repository, cols ...string) error {
+	_, err := db.GetEngine(ctx).ID(repo.ID).Cols(cols...).Update(repo)
 	return err
 }
 
-// UpdateRepositoryCols updates repository's columns
-func UpdateRepositoryCols(ctx context.Context, repo *Repository, cols ...string) error {
-	_, err := db.GetEngine(ctx).ID(repo.ID).Cols(cols...).Update(repo)
+// UpdateRepositoryUpdatedTime updates a repository's updated time
+func UpdateRepositoryUpdatedTime(ctx context.Context, repoID int64, updateTime time.Time) error {
+	_, err := db.GetEngine(ctx).Exec("UPDATE repository SET updated_unix = ? WHERE id = ?", updateTime.Unix(), repoID)
 	return err
 }
 
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
@@ -784,7 +784,7 @@ func UploadFilePost(ctx *context.Context) {
 
 	if ctx.Repo.Repository.IsEmpty {
 		if isEmpty, err := ctx.Repo.GitRepo.IsEmpty(); err == nil && !isEmpty {
-			_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")
+			_ = repo_model.UpdateRepositoryColsWithAutoTime(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")
 		}
 	}
 
diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go
@@ -245,7 +245,7 @@ func TestDefaultWikiBranch(t *testing.T) {
 	assert.NoError(t, wiki_service.ChangeDefaultWikiBranch(db.DefaultContext, repoWithNoWiki, "main"))
 
 	// repo with wiki
-	assert.NoError(t, repo_model.UpdateRepositoryCols(db.DefaultContext, &repo_model.Repository{ID: 1, DefaultWikiBranch: "wrong-branch"}))
+	assert.NoError(t, repo_model.UpdateRepositoryColsNoAutoTime(db.DefaultContext, &repo_model.Repository{ID: 1, DefaultWikiBranch: "wrong-branch"}))
 
 	ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki")
 	ctx.SetPathParam("*", "Home")
diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go
@@ -975,7 +975,7 @@ func (g *GiteaLocalUploader) Finish(ctx context.Context) error {
 	}
 
 	g.repo.Status = repo_model.RepositoryReady
-	return repo_model.UpdateRepositoryCols(ctx, g.repo, "status")
+	return repo_model.UpdateRepositoryColsWithAutoTime(ctx, g.repo, "status")
 }
 
 func (g *GiteaLocalUploader) remapUser(ctx context.Context, source user_model.ExternalUserMigrated, target user_model.ExternalUserRemappable) error {
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
@@ -653,7 +653,7 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re
 		}
 		m.Repo.IsEmpty = false
 		// Update the is empty and default_branch columns
-		if err := repo_model.UpdateRepositoryCols(ctx, m.Repo, "default_branch", "is_empty"); err != nil {
+		if err := repo_model.UpdateRepositoryColsWithAutoTime(ctx, m.Repo, "default_branch", "is_empty"); err != nil {
 			log.Error("Failed to update default branch of repository %-v. Error: %v", m.Repo, err)
 			desc := fmt.Sprintf("Failed to update default branch of repository '%s': %v", m.Repo.RepoPath(), err)
 			if err = system_model.CreateRepositoryNotice(desc); err != nil {
diff --git a/services/repository/adopt.go b/services/repository/adopt.go
@@ -100,7 +100,7 @@ func AdoptRepository(ctx context.Context, doer, owner *user_model.User, opts Cre
 
 	// 4 - update repository status
 	repo.Status = repo_model.RepositoryReady
-	if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {
+	if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "status"); err != nil {
 		return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)
 	}
 
diff --git a/services/repository/create.go b/services/repository/create.go
@@ -321,7 +321,7 @@ func CreateRepositoryDirectly(ctx context.Context, doer, owner *user_model.User,
 	// 7 - update repository status to be ready
 	if needsUpdateToReady {
 		repo.Status = repo_model.RepositoryReady
-		if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {
+		if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "status"); err != nil {
 			return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)
 		}
 	}
diff --git a/services/repository/files/update.go b/services/repository/files/update.go
@@ -306,7 +306,7 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 
 	if repo.IsEmpty {
 		if isEmpty, err := gitRepo.IsEmpty(); err == nil && !isEmpty {
-			_ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: repo.ID, IsEmpty: false, DefaultBranch: opts.NewBranch}, "is_empty", "default_branch")
+			_ = repo_model.UpdateRepositoryColsWithAutoTime(ctx, &repo_model.Repository{ID: repo.ID, IsEmpty: false, DefaultBranch: opts.NewBranch}, "is_empty", "default_branch")
 		}
 	}
 
diff --git a/services/repository/fork.go b/services/repository/fork.go
@@ -198,7 +198,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 
 	// 8 - update repository status to be ready
 	repo.Status = repo_model.RepositoryReady
-	if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {
+	if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "status"); err != nil {
 		return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)
 	}
 
diff --git a/services/repository/push.go b/services/repository/push.go
@@ -283,7 +283,7 @@ func pushNewBranch(ctx context.Context, repo *repo_model.Repository, pusher *use
 			}
 		}
 		// Update the is empty and default_branch columns
-		if err := repo_model.UpdateRepositoryCols(ctx, repo, "default_branch", "is_empty"); err != nil {
+		if err := repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "default_branch", "is_empty"); err != nil {
 			return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)
 		}
 	}
diff --git a/services/repository/template.go b/services/repository/template.go
@@ -184,7 +184,7 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ
 
 	// 6 - update repository status to be ready
 	generateRepo.Status = repo_model.RepositoryReady
-	if err = repo_model.UpdateRepositoryCols(ctx, generateRepo, "status"); err != nil {
+	if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, generateRepo, "status"); err != nil {
 		return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,15 @@ func UpdateRepositoryOwnerNames(ctx context.Context, ownerID int64, ownerName st`
`34`	`34`	`return committer.Commit()`
`35`	`35`	`}`
`36`	`36`
`37`		`-// UpdateRepositoryUpdatedTime updates a repository's updated time`
`38`		`-func UpdateRepositoryUpdatedTime(ctx context.Context, repoID int64, updateTime time.Time) error {`
`39`		`- _, err := db.GetEngine(ctx).Exec("UPDATE repository SET updated_unix = ? WHERE id = ?", updateTime.Unix(), repoID)`
	`37`	`+// UpdateRepositoryColsWithAutoTime updates repository's columns`
	`38`	`+func UpdateRepositoryColsWithAutoTime(ctx context.Context, repo *Repository, cols ...string) error {`
	`39`	`+ _, err := db.GetEngine(ctx).ID(repo.ID).Cols(cols...).Update(repo)`
`40`	`40`	`return err`
`41`	`41`	`}`
`42`	`42`
`43`		`-// UpdateRepositoryCols updates repository's columns`
`44`		`-func UpdateRepositoryCols(ctx context.Context, repo *Repository, cols ...string) error {`
`45`		`- _, err := db.GetEngine(ctx).ID(repo.ID).Cols(cols...).Update(repo)`
	`43`	`+// UpdateRepositoryUpdatedTime updates a repository's updated time`
	`44`	`+func UpdateRepositoryUpdatedTime(ctx context.Context, repoID int64, updateTime time.Time) error {`
	`45`	`+ _, err := db.GetEngine(ctx).Exec("UPDATE repository SET updated_unix = ? WHERE id = ?", updateTime.Unix(), repoID)`
`46`	`46`	`return err`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -784,7 +784,7 @@ func UploadFilePost(ctx *context.Context) {`
`784`	`784`
`785`	`785`	`if ctx.Repo.Repository.IsEmpty {`
`786`	`786`	`if isEmpty, err := ctx.Repo.GitRepo.IsEmpty(); err == nil && !isEmpty {`
`787`		`- _ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")`
	`787`	`+ _ = repo_model.UpdateRepositoryColsWithAutoTime(ctx, &repo_model.Repository{ID: ctx.Repo.Repository.ID, IsEmpty: false}, "is_empty")`
`788`	`788`	`}`
`789`	`789`	`}`
`790`	`790`
Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ func (g *GiteaLocalUploader) Finish(ctx context.Context) error {`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`g.repo.Status = repo_model.RepositoryReady`
`978`		`- return repo_model.UpdateRepositoryCols(ctx, g.repo, "status")`
	`978`	`+ return repo_model.UpdateRepositoryColsWithAutoTime(ctx, g.repo, "status")`
`979`	`979`	`}`
`980`	`980`
`981`	`981`	`func (g *GiteaLocalUploader) remapUser(ctx context.Context, source user_model.ExternalUserMigrated, target user_model.ExternalUserRemappable) error {`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re`
`653`	`653`	`}`
`654`	`654`	`m.Repo.IsEmpty = false`
`655`	`655`	`// Update the is empty and default_branch columns`
`656`		`- if err := repo_model.UpdateRepositoryCols(ctx, m.Repo, "default_branch", "is_empty"); err != nil {`
	`656`	`+ if err := repo_model.UpdateRepositoryColsWithAutoTime(ctx, m.Repo, "default_branch", "is_empty"); err != nil {`
`657`	`657`	`log.Error("Failed to update default branch of repository %-v. Error: %v", m.Repo, err)`
`658`	`658`	`desc := fmt.Sprintf("Failed to update default branch of repository '%s': %v", m.Repo.RepoPath(), err)`
`659`	`659`	`if err = system_model.CreateRepositoryNotice(desc); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func AdoptRepository(ctx context.Context, doer, owner *user_model.User, opts Cre`
`100`	`100`
`101`	`101`	`// 4 - update repository status`
`102`	`102`	`repo.Status = repo_model.RepositoryReady`
`103`		`- if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {`
	`103`	`+ if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "status"); err != nil {`
`104`	`104`	`return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ func CreateRepositoryDirectly(ctx context.Context, doer, owner *user_model.User,`
`321`	`321`	`// 7 - update repository status to be ready`
`322`	`322`	`if needsUpdateToReady {`
`323`	`323`	`repo.Status = repo_model.RepositoryReady`
`324`		`- if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {`
	`324`	`+ if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "status"); err != nil {`
`325`	`325`	`return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)`
`326`	`326`	`}`
`327`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ func ChangeRepoFiles(ctx context.Context, repo repo_model.Repository, doer use`
`306`	`306`
`307`	`307`	`if repo.IsEmpty {`
`308`	`308`	`if isEmpty, err := gitRepo.IsEmpty(); err == nil && !isEmpty {`
`309`		`- _ = repo_model.UpdateRepositoryCols(ctx, &repo_model.Repository{ID: repo.ID, IsEmpty: false, DefaultBranch: opts.NewBranch}, "is_empty", "default_branch")`
	`309`	`+ _ = repo_model.UpdateRepositoryColsWithAutoTime(ctx, &repo_model.Repository{ID: repo.ID, IsEmpty: false, DefaultBranch: opts.NewBranch}, "is_empty", "default_branch")`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork`
`198`	`198`
`199`	`199`	`// 8 - update repository status to be ready`
`200`	`200`	`repo.Status = repo_model.RepositoryReady`
`201`		`- if err = repo_model.UpdateRepositoryCols(ctx, repo, "status"); err != nil {`
	`201`	`+ if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "status"); err != nil {`
`202`	`202`	`return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ func pushNewBranch(ctx context.Context, repo repo_model.Repository, pusher use`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`	`// Update the is empty and default_branch columns`
`286`		`- if err := repo_model.UpdateRepositoryCols(ctx, repo, "default_branch", "is_empty"); err != nil {`
	`286`	`+ if err := repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "default_branch", "is_empty"); err != nil {`
`287`	`287`	`return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)`
`288`	`288`	`}`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ`
`184`	`184`
`185`	`185`	`// 6 - update repository status to be ready`
`186`	`186`	`generateRepo.Status = repo_model.RepositoryReady`
`187`		`- if err = repo_model.UpdateRepositoryCols(ctx, generateRepo, "status"); err != nil {`
	`187`	`+ if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, generateRepo, "status"); err != nil {`
`188`	`188`	`return nil, fmt.Errorf("UpdateRepositoryCols: %w", err)`
`189`	`189`	`}`
`190`	`190`