fix more

Author: wxiaoguang

models/migrations/migrations.go

@@ -25,6 +25,7 @@ import (
 	"code.gitea.io/gitea/models/migrations/v1_23"
 	"code.gitea.io/gitea/models/migrations/v1_24"
 	"code.gitea.io/gitea/models/migrations/v1_25"
+	"code.gitea.io/gitea/models/migrations/v1_26"
 	"code.gitea.io/gitea/models/migrations/v1_6"
 	"code.gitea.io/gitea/models/migrations/v1_7"
 	"code.gitea.io/gitea/models/migrations/v1_8"
@@ -394,7 +395,9 @@ func prepareMigrationTasks() []*migration {
 		// Gitea 1.24.0 ends at database version 321
 		newMigration(321, "Use LONGTEXT for some columns and fix review_state.updated_files column", v1_25.UseLongTextInSomeColumnsAndFixBugs),
 		newMigration(322, "Extend comment tree_path length limit", v1_25.ExtendCommentTreePathLength),
-		newMigration(323, "Add support for actions concurrency", v1_25.AddActionsConcurrency),
+
+		// Gitea 1.25.0 ends at migration ID number 322 (database version 323)
+		newMigration(323, "Add support for actions concurrency", v1_26.AddActionsConcurrency),
 	}
 	return preparedMigrations
 }

models/migrations/v1_25/v321_test.go

@@ -11,6 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_UseLongTextInSomeColumnsAndFixBugs(t *testing.T) {
@@ -43,28 +44,26 @@ func Test_UseLongTextInSomeColumnsAndFixBugs(t *testing.T) {
 	}
 
 	// Prepare and load the testing database
-	x, deferable := base.PrepareTestEnv(t, 0, new(ReviewState), new(PackageProperty), new(Notice))
-	defer deferable()
+	x, deferrable := base.PrepareTestEnv(t, 0, new(ReviewState), new(PackageProperty), new(Notice))
+	defer deferrable()
 
 	assert.NoError(t, UseLongTextInSomeColumnsAndFixBugs(x))
 
-	tables, err := x.DBMetas()
-	assert.NoError(t, err)
+	table, err := x.TableInfo("review_state")
+	require.NoError(t, err)
+	column := table.GetColumn("updated_files")
+	require.NotNil(t, column)
+	assert.Equal(t, "LONGTEXT", column.SQLType.Name)
 
-	for _, table := range tables {
-		switch table.Name {
-		case "review_state":
-			column := table.GetColumn("updated_files")
-			assert.NotNil(t, column)
-			assert.Equal(t, "LONGTEXT", column.SQLType.Name)
-		case "package_property":
-			column := table.GetColumn("value")
-			assert.NotNil(t, column)
-			assert.Equal(t, "LONGTEXT", column.SQLType.Name)
-		case "notice":
-			column := table.GetColumn("description")
-			assert.NotNil(t, column)
-			assert.Equal(t, "LONGTEXT", column.SQLType.Name)
-		}
-	}
+	table, err = x.TableInfo("package_property")
+	require.NoError(t, err)
+	column = table.GetColumn("value")
+	require.NotNil(t, column)
+	assert.Equal(t, "LONGTEXT", column.SQLType.Name)
+
+	table, err = x.TableInfo("notice")
+	require.NoError(t, err)
+	column = table.GetColumn("description")
+	require.NotNil(t, column)
+	assert.Equal(t, "LONGTEXT", column.SQLType.Name)
 }

models/migrations/v1_25/v322_test.go

@@ -10,6 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_ExtendCommentTreePathLength(t *testing.T) {
@@ -22,21 +23,17 @@ func Test_ExtendCommentTreePathLength(t *testing.T) {
 		TreePath string `xorm:"VARCHAR(255)"`
 	}
 
-	x, deferable := base.PrepareTestEnv(t, 0, new(Comment))
-	defer deferable()
+	x, deferrable := base.PrepareTestEnv(t, 0, new(Comment))
+	defer deferrable()
 
-	assert.NoError(t, ExtendCommentTreePathLength(x))
+	require.NoError(t, ExtendCommentTreePathLength(x))
 
-	tables, err := x.DBMetas()
-	assert.NoError(t, err)
+	table, err := x.TableInfo("comment")
+	require.NoError(t, err)
 
-	for _, table := range tables {
-		switch table.Name {
-		case "comment":
-			column := table.GetColumn("tree_path")
-			assert.NotNil(t, column)
-			assert.Contains(t, []string{"NVARCHAR", "VARCHAR"}, column.SQLType.Name)
-			assert.Equal(t, int64(4000), column.Length)
-		}
-	}
+	column := table.GetColumn("tree_path")
+	require.NotNil(t, column)
+
+	assert.Contains(t, []string{"NVARCHAR", "VARCHAR"}, column.SQLType.Name)
+	assert.EqualValues(t, 4000, column.Length)
 }

models/migrations/v1_26/main_test.go

@@ -0,0 +1,14 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_26
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/models/migrations/base"
+)
+
+func TestMain(m *testing.M) {
+	base.MainTest(m)
+}

models/migrations/v1_25/v323.go renamed to models/migrations/v1_26/v323.go

@@ -1,7 +1,7 @@
 // Copyright 2025 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_25
+package v1_26
 
 import (
 	"xorm.io/xorm"