From 50c54886d6bb30502e3c242785c77b10ad9f881e Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Fri, 19 Jan 2024 10:14:49 +0100
Subject: [PATCH] address some suggestions

---
 models/migrations/v1_22/v285.go      | 5 ++---
 models/migrations/v1_22/v285_test.go | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/models/migrations/v1_22/v285.go b/models/migrations/v1_22/v285.go
index 08a5b31bcb4db..202a553951f0e 100644
--- 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
index ca2fc107ff08a..451cd9d7ed551 100644
--- 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)