address some suggestions

go-gitea · Jan 19, 2024 · 50c5488 · 50c5488
1 parent 9b57a7f
commit 50c5488
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/models/migrations/v1_22/v285.go b/models/migrations/v1_22/v285.go
@@ -86,12 +86,11 @@ func AddObjectFormatNameToRepository(x *xorm.Engine) error {
 		ObjectFormatName string `xorm:"VARCHAR(6) NOT NULL DEFAULT 'sha1'"`
 	}
 
-	if err := x.Sync(new(Repository)); err != nil {
+	if _, err := x.Exec("UPDATE repository SET object_format_name = 'sha1' WHERE object_format_name = '' OR object_format_name IS NULL"); err != nil {
 		return err
 	}
 
-	_, err := x.Exec("UPDATE repository SET object_format_name = 'sha1' WHERE object_format_name = '' OR object_format_name IS NULL")
-	return err
+	return x.Sync(new(Repository))
 }
 
 func AdjustDBForSha256(x *xorm.Engine) error {

diff --git a/models/migrations/v1_22/v285_test.go b/models/migrations/v1_22/v285_test.go
@@ -32,11 +32,16 @@ func Test_RepositoryFormat(t *testing.T) {
 
 	repo := new(Repository)
 
-	assert.NoError(t, AddObjectFormatNameToRepository(x))
+	_, err := x.Insert(&Repository{ID: 1})
+	assert.NoError(t, err)
+	_, err = x.Insert(&Repository{ID: 2})
+	assert.NoError(t, err)
+
+	assert.NoError(t, AdjustDBForSha256(x))
 
 	repo.ID = 20
 	repo.ObjectFormatName = "sha256"
-	_, err := x.Insert(repo)
+	_, err = x.Insert(repo)
 	assert.NoError(t, err)
 
 	repo = new(Repository)