You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2022/07/07 09:14:32 UTC
[incubator-devlake] branch main updated (04bb9d42 -> 90d0608b)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
from 04bb9d42 refactor: reflect for get primary key (#2422)
new d2b3143d fix: drop user table
new c1328967 fix: drop user table
new 20faccf9 fix: drop user table
new 90d0608b fix: drop user table
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../gitee/models/migrationscripts/init_schema.go | 4 +-
.../models/migrationscripts/archived/issue.go | 1 +
.../{ => migrationscripts/archived}/milestone.go | 7 ++-
..._schema_20220615.go => init_schema_20220707.go} | 20 +++---
plugins/github/models/migrationscripts/register.go | 1 -
.../migrationscripts/updateSchemas20220620.go | 73 ----------------------
.../gitlab/models/migrationscripts/init_schema.go | 4 +-
.../tapd/models/migrationscripts/init_schema.go | 4 +-
8 files changed, 22 insertions(+), 92 deletions(-)
copy plugins/github/models/{ => migrationscripts/archived}/milestone.go (91%)
rename plugins/github/models/migrationscripts/{init_schema_20220615.go => init_schema_20220707.go} (89%)
delete mode 100644 plugins/github/models/migrationscripts/updateSchemas20220620.go
[incubator-devlake] 03/04: fix: drop user table
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 20faccf94e7ded31cd47ba9c7667437533ecfa5d
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu Jul 7 16:52:57 2022 +0800
fix: drop user table
---
.../milestone.go} | 45 ++++------------------
.../migrationscripts/init_schema_20220707.go | 2 +
plugins/github/models/migrationscripts/register.go | 1 -
3 files changed, 10 insertions(+), 38 deletions(-)
diff --git a/plugins/github/models/migrationscripts/updateSchemas20220708.go b/plugins/github/models/migrationscripts/archived/milestone.go
similarity index 58%
rename from plugins/github/models/migrationscripts/updateSchemas20220708.go
rename to plugins/github/models/migrationscripts/archived/milestone.go
index 4ef32a41..7f05f969 100644
--- a/plugins/github/models/migrationscripts/updateSchemas20220708.go
+++ b/plugins/github/models/migrationscripts/archived/milestone.go
@@ -15,59 +15,30 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package migrationscripts
+package archived
import (
- "context"
- "github.com/apache/incubator-devlake/models/migrationscripts/archived"
- "gorm.io/gorm"
"time"
+
+ "github.com/apache/incubator-devlake/models/migrationscripts/archived"
)
-// GithubMilestone20220620 new struct for milestones
-type GithubMilestone20220620 struct {
- archived.NoPKModel
+type GithubMilestone struct {
ConnectionId uint64 `gorm:"primaryKey"`
MilestoneId int `gorm:"primaryKey;autoIncrement:false"`
RepoId int
Number int
URL string
+ Title string
OpenIssues int
ClosedIssues int
State string
- Title string
CreatedAt time.Time
UpdatedAt time.Time
- ClosedAt time.Time
-}
-
-// GithubIssue20220708 new field for models.GithubIssue
-type GithubIssue20220708 struct {
- MilestoneId int
+ ClosedAt *time.Time
+ archived.NoPKModel
}
-type UpdateSchemas20220708 struct{}
-
-func (GithubMilestone20220620) TableName() string {
+func (GithubMilestone) TableName() string {
return "_tool_github_milestones"
}
-
-func (GithubIssue20220708) TableName() string {
- return "_tool_github_issues"
-}
-
-func (*UpdateSchemas20220708) Up(_ context.Context, db *gorm.DB) error {
- err := db.Migrator().AddColumn(GithubIssue20220708{}, "milestone_id")
- if err != nil {
- return err
- }
- return db.Migrator().CreateTable(GithubMilestone20220620{})
-}
-
-func (*UpdateSchemas20220708) Version() uint64 {
- return 20220708000001
-}
-
-func (*UpdateSchemas20220708) Name() string {
- return "Add milestone for github"
-}
diff --git a/plugins/github/models/migrationscripts/init_schema_20220707.go b/plugins/github/models/migrationscripts/init_schema_20220707.go
index c11853cf..07c85a4d 100644
--- a/plugins/github/models/migrationscripts/init_schema_20220707.go
+++ b/plugins/github/models/migrationscripts/init_schema_20220707.go
@@ -72,6 +72,7 @@ func (u *initSchemas) Up(ctx context.Context, db *gorm.DB) error {
&archived.GithubPullRequestIssue{},
&archived.GithubCommitStat{},
"_tool_github_users",
+ "_tool_github_milestones",
"_raw_github_api_issues",
"_raw_github_api_comments",
"_raw_github_api_commits",
@@ -126,6 +127,7 @@ func (u *initSchemas) Up(ctx context.Context, db *gorm.DB) error {
&archived.GithubAccount{},
&archived.GithubPullRequestIssue{},
&archived.GithubCommitStat{},
+ &archived.GithubMilestone{},
)
}
diff --git a/plugins/github/models/migrationscripts/register.go b/plugins/github/models/migrationscripts/register.go
index 00159230..f7da9f74 100644
--- a/plugins/github/models/migrationscripts/register.go
+++ b/plugins/github/models/migrationscripts/register.go
@@ -25,6 +25,5 @@ import (
func All() []migration.Script {
return []migration.Script{
new(initSchemas),
- new(UpdateSchemas20220708),
}
}
[incubator-devlake] 02/04: fix: drop user table
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit c1328967b5a80c1f1548eebfae284bfc6841e752
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu Jul 7 16:43:23 2022 +0800
fix: drop user table
---
...init_schema_20220615.go => init_schema_20220707.go} | 16 ++++++++--------
plugins/github/models/migrationscripts/register.go | 2 +-
...dateSchemas20220620.go => updateSchemas20220708.go} | 18 +++++++++---------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/plugins/github/models/migrationscripts/init_schema_20220615.go b/plugins/github/models/migrationscripts/init_schema_20220707.go
similarity index 91%
rename from plugins/github/models/migrationscripts/init_schema_20220615.go
rename to plugins/github/models/migrationscripts/init_schema_20220707.go
index 19324401..c11853cf 100644
--- a/plugins/github/models/migrationscripts/init_schema_20220615.go
+++ b/plugins/github/models/migrationscripts/init_schema_20220707.go
@@ -28,7 +28,7 @@ import (
"gorm.io/gorm"
)
-type GithubConnection20220615 struct {
+type GithubConnection20220707 struct {
commonArchived.Model
Name string `gorm:"type:varchar(100);uniqueIndex" json:"name" validate:"required"`
Endpoint string `mapstructure:"endpoint" env:"GITHUB_ENDPOINT" validate:"required"`
@@ -37,7 +37,7 @@ type GithubConnection20220615 struct {
Token string `mapstructure:"token" env:"GITHUB_AUTH" validate:"required" encrypt:"yes"`
}
-func (GithubConnection20220615) TableName() string {
+func (GithubConnection20220707) TableName() string {
return "_tool_github_connections"
}
@@ -50,8 +50,8 @@ func (u *initSchemas) SetConfigGetter(config core.ConfigGetter) {
}
func (u *initSchemas) Up(ctx context.Context, db *gorm.DB) error {
- if db.Migrator().HasTable(GithubConnection20220615{}) {
- err := db.Migrator().DropTable(GithubConnection20220615{})
+ if db.Migrator().HasTable(GithubConnection20220707{}) {
+ err := db.Migrator().DropTable(GithubConnection20220707{})
if err != nil {
return err
}
@@ -88,12 +88,12 @@ func (u *initSchemas) Up(ctx context.Context, db *gorm.DB) error {
if err != nil {
return err
}
- err = db.Migrator().CreateTable(GithubConnection20220615{})
+ err = db.Migrator().CreateTable(GithubConnection20220707{})
if err != nil {
return err
}
encodeKey := u.config.GetString(core.EncodeKeyEnvStr)
- connection := &GithubConnection20220615{}
+ connection := &GithubConnection20220707{}
connection.Endpoint = u.config.GetString(`GITHUB_ENDPOINT`)
connection.Proxy = u.config.GetString(`GITHUB_PROXY`)
connection.Token = u.config.GetString(`GITHUB_AUTH`)
@@ -130,9 +130,9 @@ func (u *initSchemas) Up(ctx context.Context, db *gorm.DB) error {
}
func (*initSchemas) Version() uint64 {
- return 20220615000001
+ return 20220707000001
}
func (*initSchemas) Name() string {
- return "Github init schemas 20220611"
+ return "Github init schemas 20220707"
}
diff --git a/plugins/github/models/migrationscripts/register.go b/plugins/github/models/migrationscripts/register.go
index e0b31a88..00159230 100644
--- a/plugins/github/models/migrationscripts/register.go
+++ b/plugins/github/models/migrationscripts/register.go
@@ -25,6 +25,6 @@ import (
func All() []migration.Script {
return []migration.Script{
new(initSchemas),
- new(UpdateSchemas20220620),
+ new(UpdateSchemas20220708),
}
}
diff --git a/plugins/github/models/migrationscripts/updateSchemas20220620.go b/plugins/github/models/migrationscripts/updateSchemas20220708.go
similarity index 79%
rename from plugins/github/models/migrationscripts/updateSchemas20220620.go
rename to plugins/github/models/migrationscripts/updateSchemas20220708.go
index c5178cfa..4ef32a41 100644
--- a/plugins/github/models/migrationscripts/updateSchemas20220620.go
+++ b/plugins/github/models/migrationscripts/updateSchemas20220708.go
@@ -41,33 +41,33 @@ type GithubMilestone20220620 struct {
ClosedAt time.Time
}
-// GithubIssue20220620 new field for models.GithubIssue
-type GithubIssue20220620 struct {
+// GithubIssue20220708 new field for models.GithubIssue
+type GithubIssue20220708 struct {
MilestoneId int
}
-type UpdateSchemas20220620 struct{}
+type UpdateSchemas20220708 struct{}
func (GithubMilestone20220620) TableName() string {
return "_tool_github_milestones"
}
-func (GithubIssue20220620) TableName() string {
+func (GithubIssue20220708) TableName() string {
return "_tool_github_issues"
}
-func (*UpdateSchemas20220620) Up(_ context.Context, db *gorm.DB) error {
- err := db.Migrator().AddColumn(GithubIssue20220620{}, "milestone_id")
+func (*UpdateSchemas20220708) Up(_ context.Context, db *gorm.DB) error {
+ err := db.Migrator().AddColumn(GithubIssue20220708{}, "milestone_id")
if err != nil {
return err
}
return db.Migrator().CreateTable(GithubMilestone20220620{})
}
-func (*UpdateSchemas20220620) Version() uint64 {
- return 20220620000001
+func (*UpdateSchemas20220708) Version() uint64 {
+ return 20220708000001
}
-func (*UpdateSchemas20220620) Name() string {
+func (*UpdateSchemas20220708) Name() string {
return "Add milestone for github"
}
[incubator-devlake] 04/04: fix: drop user table
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 90d0608beb5c86791eb1d4b46eaf61c07be26707
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu Jul 7 17:03:06 2022 +0800
fix: drop user table
---
plugins/github/models/migrationscripts/archived/issue.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/plugins/github/models/migrationscripts/archived/issue.go b/plugins/github/models/migrationscripts/archived/issue.go
index 09af0e6e..9fb22250 100644
--- a/plugins/github/models/migrationscripts/archived/issue.go
+++ b/plugins/github/models/migrationscripts/archived/issue.go
@@ -38,6 +38,7 @@ type GithubIssue struct {
AuthorName string `gorm:"type:varchar(255)"`
AssigneeId int
AssigneeName string `gorm:"type:varchar(255)"`
+ MilestoneId int `gorm:"index"`
LeadTimeMinutes uint
Url string `gorm:"type:varchar(255)"`
ClosedAt *time.Time
[incubator-devlake] 01/04: fix: drop user table
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit d2b3143d096ad84850237fb605df26bc709dbb3a
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu Jul 7 16:37:14 2022 +0800
fix: drop user table
---
plugins/gitee/models/migrationscripts/init_schema.go | 4 ++--
plugins/github/models/migrationscripts/init_schema_20220615.go | 2 +-
plugins/gitlab/models/migrationscripts/init_schema.go | 4 ++--
plugins/tapd/models/migrationscripts/init_schema.go | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/plugins/gitee/models/migrationscripts/init_schema.go b/plugins/gitee/models/migrationscripts/init_schema.go
index 5b077ef1..a25aa3c6 100644
--- a/plugins/gitee/models/migrationscripts/init_schema.go
+++ b/plugins/gitee/models/migrationscripts/init_schema.go
@@ -57,7 +57,6 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
&archived.GiteeRepoCommit{},
&archived.GiteePullRequest{},
&archived.GiteePullRequestLabel{},
- &archived.GiteeAccount{},
&archived.GiteePullRequestComment{},
&archived.GiteeIssue{},
&archived.GiteeIssueComment{},
@@ -67,6 +66,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
&archived.GiteePullRequestIssue{},
&archived.GiteeReviewer{},
&archived.GiteeConnection{},
+ "_tool_gitee_users",
)
if err != nil {
@@ -118,7 +118,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
}
func (*InitSchemas) Version() uint64 {
- return 20220617231268
+ return 20220707231268
}
func (*InitSchemas) Name() string {
diff --git a/plugins/github/models/migrationscripts/init_schema_20220615.go b/plugins/github/models/migrationscripts/init_schema_20220615.go
index 35473180..19324401 100644
--- a/plugins/github/models/migrationscripts/init_schema_20220615.go
+++ b/plugins/github/models/migrationscripts/init_schema_20220615.go
@@ -69,9 +69,9 @@ func (u *initSchemas) Up(ctx context.Context, db *gorm.DB) error {
&archived.GithubIssueComment{},
&archived.GithubIssueEvent{},
&archived.GithubIssueLabel{},
- &archived.GithubAccount{},
&archived.GithubPullRequestIssue{},
&archived.GithubCommitStat{},
+ "_tool_github_users",
"_raw_github_api_issues",
"_raw_github_api_comments",
"_raw_github_api_commits",
diff --git a/plugins/gitlab/models/migrationscripts/init_schema.go b/plugins/gitlab/models/migrationscripts/init_schema.go
index 1d39e077..f757e43c 100644
--- a/plugins/gitlab/models/migrationscripts/init_schema.go
+++ b/plugins/gitlab/models/migrationscripts/init_schema.go
@@ -41,11 +41,11 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
&archived.GitlabMrNote{},
&archived.GitlabMrCommit{},
&archived.GitlabMrComment{},
- &archived.GitlabAccount{},
&archived.GitlabConnection{},
&archived.GitlabIssue{},
&archived.GitlabIssueLabel{},
&archived.GitlabMrLabel{},
+ "_tool_gitlab_users",
"_raw_gitlab_api_children_on_pipeline",
"_raw_gitlab_api_commit",
"_raw_gitlab_api_issues",
@@ -116,7 +116,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
}
func (*InitSchemas) Version() uint64 {
- return 20220614231236
+ return 20220707231236
}
func (*InitSchemas) Name() string {
diff --git a/plugins/tapd/models/migrationscripts/init_schema.go b/plugins/tapd/models/migrationscripts/init_schema.go
index 7ef96277..cd81ca63 100644
--- a/plugins/tapd/models/migrationscripts/init_schema.go
+++ b/plugins/tapd/models/migrationscripts/init_schema.go
@@ -50,11 +50,11 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
"_raw_tapd_api_users",
"_raw_tapd_api_worklogs",
"_raw_tapd_api_sub_workspaces",
+ "_tool_tapd_users",
&archived.TapdWorkspace{},
&archived.TapdSubWorkspace{},
&archived.TapdWorklog{},
&archived.TapdWorkspaceIteration{},
- &archived.TapdAccount{},
&archived.TapdBugChangelog{},
&archived.TapdBugChangelogItem{},
&archived.TapdStoryChangelog{},
@@ -132,7 +132,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error {
}
func (*InitSchemas) Version() uint64 {
- return 20220620231138
+ return 20220707201138
}
func (*InitSchemas) Name() string {