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 <[email protected]>
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),
        }
 }

Reply via email to