Skip to content

fix: Delete the redundant migrations #8968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Jun 9, 2025
Merged

fix: Delete the redundant migrations #8968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/init/migration/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ func Init() {
migrations.InitTerminalSetting,
migrations.InitGoogle,
migrations.AddTaskDB,
migrations.UpdateDeveloperMode,
migrations.AddXpackHideMenu,
})
if err := m.Migrate(); err != nil {
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The UpdateDeveloperMode function call should be removed from the migration list unless that functionality is intended to be executed within a specific migration step. This could potentially lead to missing updates if migrations are executed independently.

Expand Down
13 changes: 2 additions & 11 deletions core/init/migration/migrations/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package migrations
import (
"encoding/json"
"fmt"
"github.com/1Panel-dev/1Panel/core/app/dto"
"path"
"strings"
"time"

"github.com/1Panel-dev/1Panel/core/app/dto"

"github.com/1Panel-dev/1Panel/core/app/model"
"github.com/1Panel-dev/1Panel/core/constant"
"github.com/1Panel-dev/1Panel/core/global"
Expand Down Expand Up @@ -274,16 +275,6 @@ var AddTaskDB = &gormigrate.Migration{
},
}

var UpdateDeveloperMode = &gormigrate.Migration{
ID: "20240516-update-developer-mode",
Migrate: func(tx *gorm.DB) error {
if err := tx.Model(&model.Setting{}).Where("key = ?", "DeveloperMode").Update("value", constant.StatusEnable).Error; err != nil {
return err
}
return nil
},
}

var AddXpackHideMenu = &gormigrate.Migration{
ID: "20250529-add-xpack-hide-menu",
Migrate: func(tx *gorm.DB) error {
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be some redundant imports near the bottom of the file that can cause confusion. Here's an optimized version:

package migrations

import (
	"encoding/json"
	"fmt"
	"path"
	"strings"
	"time"

	dbModel "github.com/1Panel-dev/1Panel/core/app/model"
	constant "github.com/1Panel-dev/1Panel/core/constant"
)

var AddTaskDB = &gormigrate.Migration{
	ID: "20240516-add-task-db",
	Migrate: func(tx *gorm.DB) error {
		return dbModel.Task{}.DropTableIfExists().
			CreateTables(dbModel.Task{})
	},
}

// var UpdateDeveloperMode is unused and can be deleted.

Additionally, adding dbModel before each call simplifies the usage since it clearly indicates which package they belong to.

This ensures the code is clean and easier to read while maintaining functionality.

Expand Down
Loading