This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 7e8e3ef2 fix invalid enckey and rename migration scripts (#2541)
7e8e3ef2 is described below
commit 7e8e3ef2a3810b84e252d53f0fa2ba63051bf70e
Author: abeizn <[email protected]>
AuthorDate: Wed Jul 20 15:24:52 2022 +0800
fix invalid enckey and rename migration scripts (#2541)
* fix: invalid enckey
* fix: invalid encKey and update migration version
* fix: rename migration scripts
* fix: rename migration scripts
* fix: invalid enckey and rename migration scripts
---
migration/migrator.go | 9 +++++----
.../{init_lake_schemas.go => 20220406_add_frame_tables.go} | 12 ++++++------
...eSchemas20220505.go => 20220505_rename_step_to_stage.go} | 8 ++++----
...ateSchemas20220601.go => 20220601_add_subtasks_field.go} | 8 ++++----
...Schemas20220616.go => 20220616_update_blueprint_mode.go} | 8 ++++----
...rint-normal-mode.go => 20220622_rename_tasks_to_plan.go} | 8 ++++----
...init_domain_schemas.go => 20220707_add_domain_tables.go} | 12 ++++++------
models/migrationscripts/register.go | 12 ++++++------
.../{init_schema.go => 20220714_add_init_tables.go} | 10 +++++-----
plugins/ae/models/migrationscripts/register.go | 2 +-
.../{init_schema.go => 20220714_add_init_tables.go} | 10 +++++-----
plugins/feishu/models/migrationscripts/register.go | 2 +-
.../{init_schema.go => 20220714_add_init_tables.go} | 10 +++++-----
plugins/gitee/models/migrationscripts/register.go | 2 +-
.../{init_schema.go => 20220715_add_init_tables.go} | 11 ++++++-----
plugins/github/models/migrationscripts/register.go | 2 +-
.../{init_schema.go => 20220714_add_init_tables.go} | 8 ++++----
plugins/gitlab/models/migrationscripts/register.go | 2 +-
.../{init_schema.go => 20220714_add_init_tables.go} | 8 ++++----
plugins/jenkins/models/migrationscripts/register.go | 2 +-
...{pre_init_schemas.go => 20220505_rename_source_table.go} | 12 ++++++------
.../{init_schema.go => 20220716_add_init_tables.go} | 13 +++++++------
plugins/jira/models/migrationscripts/register.go | 4 ++--
.../{init_schema.go => 20220714_add_init_tables.go} | 8 ++++----
plugins/tapd/models/migrationscripts/register.go | 2 +-
25 files changed, 94 insertions(+), 91 deletions(-)
diff --git a/migration/migrator.go b/migration/migrator.go
index ce7eae0f..caa5d096 100644
--- a/migration/migrator.go
+++ b/migration/migrator.go
@@ -20,9 +20,10 @@ package migration
import (
"context"
"fmt"
- "gorm.io/gorm"
"sort"
"sync"
+
+ "gorm.io/gorm"
)
var m = migrator{}
@@ -33,10 +34,10 @@ type scriptWithComment struct {
}
type migrator struct {
sync.Mutex
- db *gorm.DB
+ db *gorm.DB
executed map[string]bool
- scripts []*scriptWithComment
- pending []*scriptWithComment
+ scripts []*scriptWithComment
+ pending []*scriptWithComment
}
func Init(db *gorm.DB) {
diff --git a/models/migrationscripts/init_lake_schemas.go
b/models/migrationscripts/20220406_add_frame_tables.go
similarity index 80%
rename from models/migrationscripts/init_lake_schemas.go
rename to models/migrationscripts/20220406_add_frame_tables.go
index b85593ca..1a094b8f 100644
--- a/models/migrationscripts/init_lake_schemas.go
+++ b/models/migrationscripts/20220406_add_frame_tables.go
@@ -24,9 +24,9 @@ import (
"gorm.io/gorm"
)
-type initLakeSchemas struct{}
+type addFrameTables struct{}
-func (*initLakeSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (*addFrameTables) Up(ctx context.Context, db *gorm.DB) error {
return db.Migrator().AutoMigrate(
&archived.Task{},
&archived.Notification{},
@@ -35,14 +35,14 @@ func (*initLakeSchemas) Up(ctx context.Context, db
*gorm.DB) error {
)
}
-func (*initLakeSchemas) Version() uint64 {
+func (*addFrameTables) Version() uint64 {
return 20220406212344
}
-func (*initLakeSchemas) Owner() string {
+func (*addFrameTables) Owner() string {
return "Framework"
}
-func (*initLakeSchemas) Name() string {
- return "create init pre-schemas"
+func (*addFrameTables) Name() string {
+ return "create init schemas"
}
diff --git a/models/migrationscripts/updateSchemas20220505.go
b/models/migrationscripts/20220505_rename_step_to_stage.go
similarity index 83%
rename from models/migrationscripts/updateSchemas20220505.go
rename to models/migrationscripts/20220505_rename_step_to_stage.go
index b29cc2fa..3c28beb1 100644
--- a/models/migrationscripts/updateSchemas20220505.go
+++ b/models/migrationscripts/20220505_rename_step_to_stage.go
@@ -23,9 +23,9 @@ import (
"gorm.io/gorm"
)
-type updateSchemas20220505 struct{}
+type renameStepToStage struct{}
-func (*updateSchemas20220505) Up(ctx context.Context, db *gorm.DB) error {
+func (*renameStepToStage) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().RenameColumn(archived.Pipeline{}, "step", "stage")
if err != nil {
return err
@@ -33,10 +33,10 @@ func (*updateSchemas20220505) Up(ctx context.Context, db
*gorm.DB) error {
return nil
}
-func (*updateSchemas20220505) Version() uint64 {
+func (*renameStepToStage) Version() uint64 {
return 20220505212344
}
-func (*updateSchemas20220505) Name() string {
+func (*renameStepToStage) Name() string {
return "Rename step to stage "
}
diff --git a/models/migrationscripts/updateSchemas20220601.go
b/models/migrationscripts/20220601_add_subtasks_field.go
similarity index 90%
rename from models/migrationscripts/updateSchemas20220601.go
rename to models/migrationscripts/20220601_add_subtasks_field.go
index 55a77d80..b495cbdf 100644
--- a/models/migrationscripts/updateSchemas20220601.go
+++ b/models/migrationscripts/20220601_add_subtasks_field.go
@@ -47,9 +47,9 @@ func (Task20220601) TableName() string {
return "_devlake_tasks"
}
-type updateSchemas20220601 struct{}
+type addSubtasksField struct{}
-func (*updateSchemas20220601) Up(ctx context.Context, db *gorm.DB) error {
+func (*addSubtasksField) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().AddColumn(Task20220601{}, "subtasks")
if err != nil {
@@ -59,10 +59,10 @@ func (*updateSchemas20220601) Up(ctx context.Context, db
*gorm.DB) error {
return nil
}
-func (*updateSchemas20220601) Version() uint64 {
+func (*addSubtasksField) Version() uint64 {
return 20220601000005
}
-func (*updateSchemas20220601) Name() string {
+func (*addSubtasksField) Name() string {
return "add column `subtasks` at _devlake_tasks"
}
diff --git a/models/migrationscripts/updateSchemas20220616.go
b/models/migrationscripts/20220616_update_blueprint_mode.go
similarity index 87%
rename from models/migrationscripts/updateSchemas20220616.go
rename to models/migrationscripts/20220616_update_blueprint_mode.go
index 9729677c..cf4fba92 100644
--- a/models/migrationscripts/updateSchemas20220616.go
+++ b/models/migrationscripts/20220616_update_blueprint_mode.go
@@ -32,9 +32,9 @@ func (Blueprint20220616) TableName() string {
return "_devlake_blueprints"
}
-type updateSchemas20220616 struct{}
+type updateBlueprintMode struct{}
-func (*updateSchemas20220616) Up(ctx context.Context, db *gorm.DB) error {
+func (*updateBlueprintMode) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().AutoMigrate(&Blueprint20220616{})
if err != nil {
return err
@@ -44,10 +44,10 @@ func (*updateSchemas20220616) Up(ctx context.Context, db
*gorm.DB) error {
return nil
}
-func (*updateSchemas20220616) Version() uint64 {
+func (*updateBlueprintMode) Version() uint64 {
return 20220616110537
}
-func (*updateSchemas20220616) Name() string {
+func (*updateBlueprintMode) Name() string {
return "add mode field to blueprint"
}
diff --git a/models/migrationscripts/220622-blueprint-normal-mode.go
b/models/migrationscripts/20220622_rename_tasks_to_plan.go
similarity index 89%
rename from models/migrationscripts/220622-blueprint-normal-mode.go
rename to models/migrationscripts/20220622_rename_tasks_to_plan.go
index 7ba66253..e344eb4e 100644
--- a/models/migrationscripts/220622-blueprint-normal-mode.go
+++ b/models/migrationscripts/20220622_rename_tasks_to_plan.go
@@ -42,9 +42,9 @@ func (blueprintNormalMode_Pipeline) TableName() string {
}
// migration script
-type blueprintNormalMode struct{}
+type renameTasksToPlan struct{}
-func (*blueprintNormalMode) Up(ctx context.Context, db *gorm.DB) error {
+func (*renameTasksToPlan) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().AutoMigrate(&blueprintNormalMode_Blueprint{})
if err != nil {
return err
@@ -60,10 +60,10 @@ func (*blueprintNormalMode) Up(ctx context.Context, db
*gorm.DB) error {
return nil
}
-func (*blueprintNormalMode) Version() uint64 {
+func (*renameTasksToPlan) Version() uint64 {
return 20220622110537
}
-func (*blueprintNormalMode) Name() string {
+func (*renameTasksToPlan) Name() string {
return "blueprint normal mode support"
}
diff --git a/models/migrationscripts/init_domain_schemas.go
b/models/migrationscripts/20220707_add_domain_tables.go
similarity index 91%
rename from models/migrationscripts/init_domain_schemas.go
rename to models/migrationscripts/20220707_add_domain_tables.go
index e0120359..59d93ebe 100644
--- a/models/migrationscripts/init_domain_schemas.go
+++ b/models/migrationscripts/20220707_add_domain_tables.go
@@ -24,9 +24,9 @@ import (
"gorm.io/gorm"
)
-type initDomainSchemas struct{}
+type addDomainTables struct{}
-func (*initDomainSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (*addDomainTables) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
"issue_assignee_history",
"issue_status_history",
@@ -106,14 +106,14 @@ func (*initDomainSchemas) Up(ctx context.Context, db
*gorm.DB) error {
)
}
-func (*initDomainSchemas) Version() uint64 {
+func (*addDomainTables) Version() uint64 {
return 20220707232344
}
-func (*initDomainSchemas) Owner() string {
+func (*addDomainTables) Owner() string {
return "Framework"
}
-func (*initDomainSchemas) Name() string {
- return "create init schemas"
+func (*addDomainTables) Name() string {
+ return "create domain layer init schemas"
}
diff --git a/models/migrationscripts/register.go
b/models/migrationscripts/register.go
index 49b9922f..f2a7f38a 100644
--- a/models/migrationscripts/register.go
+++ b/models/migrationscripts/register.go
@@ -22,11 +22,11 @@ import "github.com/apache/incubator-devlake/migration"
// All return all the migration scripts of framework
func All() []migration.Script {
return []migration.Script{
- new(initLakeSchemas),
- new(updateSchemas20220505),
- new(updateSchemas20220601),
- new(updateSchemas20220616),
- new(blueprintNormalMode),
- new(initDomainSchemas),
+ new(addFrameTables),
+ new(renameStepToStage),
+ new(addSubtasksField),
+ new(updateBlueprintMode),
+ new(renameTasksToPlan),
+ new(addDomainTables),
}
}
diff --git a/plugins/ae/models/migrationscripts/init_schema.go
b/plugins/ae/models/migrationscripts/20220714_add_init_tables.go
similarity index 89%
rename from plugins/ae/models/migrationscripts/init_schema.go
rename to plugins/ae/models/migrationscripts/20220714_add_init_tables.go
index f522270e..f417af6e 100644
--- a/plugins/ae/models/migrationscripts/init_schema.go
+++ b/plugins/ae/models/migrationscripts/20220714_add_init_tables.go
@@ -26,15 +26,15 @@ import (
"gorm.io/gorm"
)
-type InitSchemas struct {
+type addInitTables struct {
config core.ConfigGetter
}
-func (u *InitSchemas) SetConfigGetter(config core.ConfigGetter) {
+func (u *addInitTables) SetConfigGetter(config core.ConfigGetter) {
u.config = config
}
-func (u *InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (u *addInitTables) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
&archived.AECommit{},
&archived.AEProject{},
@@ -75,10 +75,10 @@ func (u *InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
return nil
}
-func (*InitSchemas) Version() uint64 {
+func (*addInitTables) Version() uint64 {
return 20220714201133
}
-func (*InitSchemas) Name() string {
+func (*addInitTables) Name() string {
return "AE init schemas"
}
diff --git a/plugins/ae/models/migrationscripts/register.go
b/plugins/ae/models/migrationscripts/register.go
index 06d924d0..c1365f7d 100644
--- a/plugins/ae/models/migrationscripts/register.go
+++ b/plugins/ae/models/migrationscripts/register.go
@@ -24,6 +24,6 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(InitSchemas),
+ new(addInitTables),
}
}
diff --git a/plugins/feishu/models/migrationscripts/init_schema.go
b/plugins/feishu/models/migrationscripts/20220714_add_init_tables.go
similarity index 89%
rename from plugins/feishu/models/migrationscripts/init_schema.go
rename to plugins/feishu/models/migrationscripts/20220714_add_init_tables.go
index 1bf3da77..585bea93 100644
--- a/plugins/feishu/models/migrationscripts/init_schema.go
+++ b/plugins/feishu/models/migrationscripts/20220714_add_init_tables.go
@@ -27,15 +27,15 @@ import (
"gorm.io/gorm"
)
-type InitSchemas struct {
+type addInitTables struct {
config core.ConfigGetter
}
-func (u *InitSchemas) SetConfigGetter(config core.ConfigGetter) {
+func (u *addInitTables) SetConfigGetter(config core.ConfigGetter) {
u.config = config
}
-func (u *InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (u *addInitTables) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
&archived.FeishuConnection{},
&archived.FeishuMeetingTopUserItem{},
@@ -70,10 +70,10 @@ func (u *InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
return nil
}
-func (*InitSchemas) Version() uint64 {
+func (*addInitTables) Version() uint64 {
return 20220714000001
}
-func (*InitSchemas) Name() string {
+func (*addInitTables) Name() string {
return "Feishu init schemas"
}
diff --git a/plugins/feishu/models/migrationscripts/register.go
b/plugins/feishu/models/migrationscripts/register.go
index 06d924d0..c1365f7d 100644
--- a/plugins/feishu/models/migrationscripts/register.go
+++ b/plugins/feishu/models/migrationscripts/register.go
@@ -24,6 +24,6 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(InitSchemas),
+ new(addInitTables),
}
}
diff --git a/plugins/gitee/models/migrationscripts/init_schema.go
b/plugins/gitee/models/migrationscripts/20220714_add_init_tables.go
similarity index 94%
rename from plugins/gitee/models/migrationscripts/init_schema.go
rename to plugins/gitee/models/migrationscripts/20220714_add_init_tables.go
index 8840d138..81b61b63 100644
--- a/plugins/gitee/models/migrationscripts/init_schema.go
+++ b/plugins/gitee/models/migrationscripts/20220714_add_init_tables.go
@@ -30,9 +30,9 @@ import (
"gorm.io/gorm"
)
-type InitSchemas struct{}
+type addInitTables struct{}
-func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (*addInitTables) Up(ctx context.Context, db *gorm.DB) error {
rawTableList := []string{
"_raw_gitee_api_commit",
"_raw_gitee_api_issues",
@@ -117,10 +117,10 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
return nil
}
-func (*InitSchemas) Version() uint64 {
- return 20220707231268
+func (*addInitTables) Version() uint64 {
+ return 20220714231268
}
-func (*InitSchemas) Name() string {
+func (*addInitTables) Name() string {
return "Gitee init schemas"
}
diff --git a/plugins/gitee/models/migrationscripts/register.go
b/plugins/gitee/models/migrationscripts/register.go
index 06d924d0..c1365f7d 100644
--- a/plugins/gitee/models/migrationscripts/register.go
+++ b/plugins/gitee/models/migrationscripts/register.go
@@ -24,6 +24,6 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(InitSchemas),
+ new(addInitTables),
}
}
diff --git a/plugins/github/models/migrationscripts/init_schema.go
b/plugins/github/models/migrationscripts/20220715_add_init_tables.go
similarity index 93%
rename from plugins/github/models/migrationscripts/init_schema.go
rename to plugins/github/models/migrationscripts/20220715_add_init_tables.go
index 553f86ed..3a431852 100644
--- a/plugins/github/models/migrationscripts/init_schema.go
+++ b/plugins/github/models/migrationscripts/20220715_add_init_tables.go
@@ -19,6 +19,7 @@ package migrationscripts
import (
"context"
+
"github.com/apache/incubator-devlake/plugins/core"
"github.com/apache/incubator-devlake/plugins/helper"
@@ -26,15 +27,15 @@ import (
"gorm.io/gorm"
)
-type initSchemas struct {
+type addInitTables struct {
config core.ConfigGetter
}
-func (u *initSchemas) SetConfigGetter(config core.ConfigGetter) {
+func (u *addInitTables) SetConfigGetter(config core.ConfigGetter) {
u.config = config
}
-func (u *initSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (u *addInitTables) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
&archived.GithubRepo{},
&archived.GithubConnection{},
@@ -121,10 +122,10 @@ func (u *initSchemas) Up(ctx context.Context, db
*gorm.DB) error {
)
}
-func (*initSchemas) Version() uint64 {
+func (*addInitTables) Version() uint64 {
return 20220715000001
}
-func (*initSchemas) Name() string {
+func (*addInitTables) Name() string {
return "Github init schemas 20220707"
}
diff --git a/plugins/github/models/migrationscripts/register.go
b/plugins/github/models/migrationscripts/register.go
index f7da9f74..c1365f7d 100644
--- a/plugins/github/models/migrationscripts/register.go
+++ b/plugins/github/models/migrationscripts/register.go
@@ -24,6 +24,6 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(initSchemas),
+ new(addInitTables),
}
}
diff --git a/plugins/gitlab/models/migrationscripts/init_schema.go
b/plugins/gitlab/models/migrationscripts/20220714_add_init_tables.go
similarity index 94%
rename from plugins/gitlab/models/migrationscripts/init_schema.go
rename to plugins/gitlab/models/migrationscripts/20220714_add_init_tables.go
index f74b88ad..3321d260 100644
--- a/plugins/gitlab/models/migrationscripts/init_schema.go
+++ b/plugins/gitlab/models/migrationscripts/20220714_add_init_tables.go
@@ -27,9 +27,9 @@ import (
"gorm.io/gorm/clause"
)
-type InitSchemas struct{}
+type addInitTables struct{}
-func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (*addInitTables) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
&archived.GitlabProject{},
&archived.GitlabMergeRequest{},
@@ -114,10 +114,10 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
return nil
}
-func (*InitSchemas) Version() uint64 {
+func (*addInitTables) Version() uint64 {
return 20220714231236
}
-func (*InitSchemas) Name() string {
+func (*addInitTables) Name() string {
return "Gitlab init schemas"
}
diff --git a/plugins/gitlab/models/migrationscripts/register.go
b/plugins/gitlab/models/migrationscripts/register.go
index 06d924d0..c1365f7d 100644
--- a/plugins/gitlab/models/migrationscripts/register.go
+++ b/plugins/gitlab/models/migrationscripts/register.go
@@ -24,6 +24,6 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(InitSchemas),
+ new(addInitTables),
}
}
diff --git a/plugins/jenkins/models/migrationscripts/init_schema.go
b/plugins/jenkins/models/migrationscripts/20220714_add_init_tables.go
similarity index 92%
rename from plugins/jenkins/models/migrationscripts/init_schema.go
rename to plugins/jenkins/models/migrationscripts/20220714_add_init_tables.go
index c4684b07..7adbf7e7 100644
--- a/plugins/jenkins/models/migrationscripts/init_schema.go
+++ b/plugins/jenkins/models/migrationscripts/20220714_add_init_tables.go
@@ -27,9 +27,9 @@ import (
"gorm.io/gorm/clause"
)
-type InitSchemas struct{}
+type addInitTables struct{}
-func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (*addInitTables) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
"_raw_jenkins_api_jobs",
"_raw_jenkins_api_builds",
@@ -78,10 +78,10 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
return nil
}
-func (*InitSchemas) Version() uint64 {
+func (*addInitTables) Version() uint64 {
return 20220714201237
}
-func (*InitSchemas) Name() string {
+func (*addInitTables) Name() string {
return "Jenkins init schemas"
}
diff --git a/plugins/jenkins/models/migrationscripts/register.go
b/plugins/jenkins/models/migrationscripts/register.go
index 06d924d0..c1365f7d 100644
--- a/plugins/jenkins/models/migrationscripts/register.go
+++ b/plugins/jenkins/models/migrationscripts/register.go
@@ -24,6 +24,6 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(InitSchemas),
+ new(addInitTables),
}
}
diff --git a/plugins/jira/models/migrationscripts/pre_init_schemas.go
b/plugins/jira/models/migrationscripts/20220505_rename_source_table.go
similarity index 88%
rename from plugins/jira/models/migrationscripts/pre_init_schemas.go
rename to plugins/jira/models/migrationscripts/20220505_rename_source_table.go
index d5d8b8a9..2056c7a6 100644
--- a/plugins/jira/models/migrationscripts/pre_init_schemas.go
+++ b/plugins/jira/models/migrationscripts/20220505_rename_source_table.go
@@ -39,9 +39,9 @@ func (JiraConnectionV010) TableName() string {
return "_tool_jira_connections"
}
-type PreJiraInitSchemas struct{}
+type renameSourceTable struct{}
-func (*PreJiraInitSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (*renameSourceTable) Up(ctx context.Context, db *gorm.DB) error {
m := db.Migrator()
if m.HasTable(&archived.JiraSource{}) &&
!m.HasTable(&archived.JiraConnection{}) {
err := db.Migrator().RenameTable(archived.JiraSource{},
JiraConnectionV010{})
@@ -52,14 +52,14 @@ func (*PreJiraInitSchemas) Up(ctx context.Context, db
*gorm.DB) error {
return nil
}
-func (*PreJiraInitSchemas) Version() uint64 {
+func (*renameSourceTable) Version() uint64 {
return 20220505212344
}
-func (*PreJiraInitSchemas) Owner() string {
+func (*renameSourceTable) Owner() string {
return "Jira"
}
-func (*PreJiraInitSchemas) Name() string {
- return "preparation for jira init_schemas"
+func (*renameSourceTable) Name() string {
+ return "Rename source to connection "
}
diff --git a/plugins/jira/models/migrationscripts/init_schema.go
b/plugins/jira/models/migrationscripts/20220716_add_init_tables.go
similarity index 94%
rename from plugins/jira/models/migrationscripts/init_schema.go
rename to plugins/jira/models/migrationscripts/20220716_add_init_tables.go
index 2545751d..557d6351 100644
--- a/plugins/jira/models/migrationscripts/init_schema.go
+++ b/plugins/jira/models/migrationscripts/20220716_add_init_tables.go
@@ -48,9 +48,10 @@ func (JiraConnectionV011) TableName() string {
return "_tool_jira_connections"
}
-type InitSchemas struct{}
+type addInitTables struct{}
+
+func (*addInitTables) Up(ctx context.Context, db *gorm.DB) error {
-func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
// history table
"_raw_jira_api_users",
@@ -109,7 +110,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
conn.RateLimitPerHour = v.RateLimit
c := config.GetConfig()
- encKey := c.GetString("ENCODE_KEY")
+ encKey := c.GetString(core.EncodeKeyEnvStr)
if encKey == "" {
return fmt.Errorf("jira v0.11 invalid
encKey")
}
@@ -137,7 +138,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
c := config.GetConfig()
encKey := c.GetString("ENCODE_KEY")
if encKey == "" {
- return fmt.Errorf("invalid encKey")
+ return fmt.Errorf("jira invalid encKey")
}
err := db.Migrator().AutoMigrate(&archived.JiraConnection{})
if err != nil {
@@ -166,10 +167,10 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
)
}
-func (*InitSchemas) Version() uint64 {
+func (*addInitTables) Version() uint64 {
return 20220716201138
}
-func (*InitSchemas) Name() string {
+func (*addInitTables) Name() string {
return "Jira init schemas"
}
diff --git a/plugins/jira/models/migrationscripts/register.go
b/plugins/jira/models/migrationscripts/register.go
index 78b36264..3c89eaff 100644
--- a/plugins/jira/models/migrationscripts/register.go
+++ b/plugins/jira/models/migrationscripts/register.go
@@ -24,7 +24,7 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(PreJiraInitSchemas),
- new(InitSchemas),
+ new(renameSourceTable),
+ new(addInitTables),
}
}
diff --git a/plugins/tapd/models/migrationscripts/init_schema.go
b/plugins/tapd/models/migrationscripts/20220714_add_init_tables.go
similarity index 95%
rename from plugins/tapd/models/migrationscripts/init_schema.go
rename to plugins/tapd/models/migrationscripts/20220714_add_init_tables.go
index 6472440c..5a3734ff 100644
--- a/plugins/tapd/models/migrationscripts/init_schema.go
+++ b/plugins/tapd/models/migrationscripts/20220714_add_init_tables.go
@@ -24,9 +24,9 @@ import (
"gorm.io/gorm"
)
-type InitSchemas struct{}
+type addInitTables struct{}
-func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
+func (*addInitTables) Up(ctx context.Context, db *gorm.DB) error {
err := db.Migrator().DropTable(
"_raw_tapd_api_bug_changelogs",
"_raw_tapd_api_bugs",
@@ -130,10 +130,10 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB)
error {
)
}
-func (*InitSchemas) Version() uint64 {
+func (*addInitTables) Version() uint64 {
return 20220714201138
}
-func (*InitSchemas) Name() string {
+func (*addInitTables) Name() string {
return "Tapd init schemas"
}
diff --git a/plugins/tapd/models/migrationscripts/register.go
b/plugins/tapd/models/migrationscripts/register.go
index 06d924d0..c1365f7d 100644
--- a/plugins/tapd/models/migrationscripts/register.go
+++ b/plugins/tapd/models/migrationscripts/register.go
@@ -24,6 +24,6 @@ import (
// All return all the migration scripts
func All() []migration.Script {
return []migration.Script{
- new(InitSchemas),
+ new(addInitTables),
}
}
