reanme table name

Author: sillyguodong

models/migrations/v1_20/v257.go

@@ -10,7 +10,7 @@ import (
 )
 
 func CreateVariableTable(x *xorm.Engine) error {
-	type Variable struct {
+	type ActionVariable struct {
 		ID          int64              `xorm:"pk autoincr"`
 		OwnerID     int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL DEFAULT 0"`
 		RepoID      int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL DEFAULT 0"`
@@ -20,5 +20,5 @@ func CreateVariableTable(x *xorm.Engine) error {
 		UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
 	}
 
-	return x.Sync(new(Variable))
+	return x.Sync(new(ActionVariable))
 }

models/variable/variable.go

@@ -16,7 +16,7 @@ import (
 	"xorm.io/builder"
 )
 
-type Variable struct {
+type ActionVariable struct {
 	ID          int64              `xorm:"pk autoincr"`
 	OwnerID     int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL DEFAULT 0"`
 	RepoID      int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL DEFAULT 0"`
@@ -27,7 +27,7 @@ type Variable struct {
 }
 
 func init() {
-	db.RegisterModel(new(Variable))
+	db.RegisterModel(new(ActionVariable))
 }
 
 type ErrVariableUnbound struct{}
@@ -58,7 +58,7 @@ var (
 	variableForbiddenPrefixReg = regexp.MustCompile("(?i)^GIT(EA|HUB)_")
 )
 
-func (v *Variable) Validate() error {
+func (v *ActionVariable) Validate() error {
 	switch {
 	case v.OwnerID == 0 && v.RepoID == 0:
 		return ErrVariableUnbound{}
@@ -73,8 +73,8 @@ func (v *Variable) Validate() error {
 	}
 }
 
-func InsertVariable(ctx context.Context, ownerID, repoID int64, name, data string) (*Variable, error) {
-	variable := &Variable{
+func InsertVariable(ctx context.Context, ownerID, repoID int64, name, data string) (*ActionVariable, error) {
+	variable := &ActionVariable{
 		OwnerID: ownerID,
 		RepoID:  repoID,
 		Name:    strings.ToUpper(name),
@@ -103,17 +103,17 @@ func (opts *FindVariablesOpts) toConds() builder.Cond {
 	return cond
 }
 
-func FindVariables(ctx context.Context, opts FindVariablesOpts) ([]*Variable, error) {
-	var variables []*Variable
+func FindVariables(ctx context.Context, opts FindVariablesOpts) ([]*ActionVariable, error) {
+	var variables []*ActionVariable
 	sess := db.GetEngine(ctx)
 	if opts.PageSize != 0 {
 		sess = db.SetSessionPagination(sess, &opts.ListOptions)
 	}
 	return variables, sess.Where(opts.toConds()).Find(&variables)
 }
 
-func GetVariableByID(ctx context.Context, variableID int64) (*Variable, error) {
-	var variable Variable
+func GetVariableByID(ctx context.Context, variableID int64) (*ActionVariable, error) {
+	var variable ActionVariable
 	has, err := db.GetEngine(ctx).Where("id=?", variableID).Get(&variable)
 	if err != nil {
 		return nil, err
@@ -123,13 +123,13 @@ func GetVariableByID(ctx context.Context, variableID int64) (*Variable, error) {
 	return &variable, nil
 }
 
-func UpdateVariable(ctx context.Context, variable *Variable) (bool, error) {
+func UpdateVariable(ctx context.Context, variable *ActionVariable) (bool, error) {
 	if err := variable.Validate(); err != nil {
 		return false, err
 	}
 	count, err := db.GetEngine(ctx).ID(variable.ID).Cols("name", "data").
 		Where("owner_id = ? and repo_id = ?", variable.OwnerID, variable.RepoID).
-		Update(&Variable{
+		Update(&ActionVariable{
 			Name: variable.Name,
 			Data: variable.Data,
 		})

routers/web/shared/variables/variables.go

@@ -31,7 +31,7 @@ func SetVariablesContext(ctx *context.Context, ownerID, repoID int64) {
 func DeleteVariable(ctx *context.Context, ownerID, repoID int64, redirectURL string) {
 	id := ctx.ParamsInt64(":variableID")
 
-	if _, err := db.DeleteByBean(ctx, &variable_model.Variable{
+	if _, err := db.DeleteByBean(ctx, &variable_model.ActionVariable{
 		ID:      id,
 		OwnerID: ownerID,
 		RepoID:  repoID,
@@ -86,7 +86,7 @@ func GetVariable(ctx *context.Context) {
 func UpdateVariable(ctx *context.Context, ownerID, repoID int64, redirectURL string) {
 	id := ctx.ParamsInt64(":variableID")
 	form := web.GetForm(ctx).(*forms.EditVariableForm)
-	ok, err := variable_model.UpdateVariable(ctx, &variable_model.Variable{
+	ok, err := variable_model.UpdateVariable(ctx, &variable_model.ActionVariable{
 		ID:      id,
 		OwnerID: ownerID,
 		RepoID:  repoID,