You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by wa...@apache.org on 2022/09/07 12:25:59 UTC
[incubator-devlake] 02/03: fix: add pipeline_projects_tables and fix common import and fix pipelineRelationship primaryKey
This is an automated email from the ASF dual-hosted git repository.
warren pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit a657a0ff3a497d8a1f1c4b1834822a38660f3423
Author: abeizn <zi...@merico.dev>
AuthorDate: Wed Sep 7 16:26:48 2022 +0800
fix: add pipeline_projects_tables and fix common import and fix pipelineRelationship primaryKey
---
models/domainlayer/devops/cicd_pipeline.go | 4 +--
.../20220905_modfiy_cicd_pipeline.go | 39 +++++++++++-----------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/models/domainlayer/devops/cicd_pipeline.go b/models/domainlayer/devops/cicd_pipeline.go
index 241abcd3..cb3b5a80 100644
--- a/models/domainlayer/devops/cicd_pipeline.go
+++ b/models/domainlayer/devops/cicd_pipeline.go
@@ -24,8 +24,8 @@ func (CICDPipeline) TableName() string {
}
type CICDPipelineRelationship struct {
- ParentPipelineId string `gorm:"primary;type:varchar(255)"`
- ChildPipelineId string `gorm:"primary;type:varchar(255)"`
+ ParentPipelineId string `gorm:"primaryKey;type:varchar(255)"`
+ ChildPipelineId string `gorm:"primaryKey;type:varchar(255)"`
common.NoPKModel
}
diff --git a/models/migrationscripts/20220905_modfiy_cicd_pipeline.go b/models/migrationscripts/20220905_modfiy_cicd_pipeline.go
index 744f940e..7b28edc5 100644
--- a/models/migrationscripts/20220905_modfiy_cicd_pipeline.go
+++ b/models/migrationscripts/20220905_modfiy_cicd_pipeline.go
@@ -19,6 +19,7 @@ package migrationscripts
import (
"context"
+
"github.com/apache/incubator-devlake/models/migrationscripts/archived"
"gorm.io/gorm"
)
@@ -26,23 +27,23 @@ import (
type modifyPipeline struct{}
func (*modifyPipeline) Up(ctx context.Context, db *gorm.DB) error {
- err := db.Migrator().DropColumn(CICDPipeline0905{}, "commit_sha")
- if err != nil {
- return err
- }
- err = db.Migrator().DropColumn(CICDPipeline0905{}, "branch")
- if err != nil {
- return err
- }
- err = db.Migrator().DropColumn(CICDPipeline0905{}, "repo")
- if err != nil {
- return err
- }
- err = db.Migrator().RenameColumn(CICDPipelineRepo0905{}, "repo_url", "repo")
- if err != nil {
- return err
- }
- err = db.Migrator().AutoMigrate(CICDPipelineRelationship0905{})
+ // err := db.Migrator().DropColumn(CICDPipeline0905{}, "commit_sha")
+ // if err != nil {
+ // return err
+ // }
+ // err = db.Migrator().DropColumn(CICDPipeline0905{}, "branch")
+ // if err != nil {
+ // return err
+ // }
+ // err = db.Migrator().DropColumn(CICDPipeline0905{}, "repo")
+ // if err != nil {
+ // return err
+ // }
+ // err = db.Migrator().RenameColumn(CICDPipelineRepo0905{}, "repo_url", "repo")
+ // if err != nil {
+ // return err
+ // }
+ err := db.Migrator().AutoMigrate(CICDPipelineRelationship0905{})
if err != nil {
return err
}
@@ -76,8 +77,8 @@ func (CICDPipelineRepo0905) TableName() string {
}
type CICDPipelineRelationship0905 struct {
- ParentPipelineId string `gorm:"primary;type:varchar(255)"`
- ChildPipelineId string `gorm:"primary;type:varchar(255)"`
+ ParentPipelineId string `gorm:"primaryKey;type:varchar(255)"`
+ ChildPipelineId string `gorm:"primaryKey;type:varchar(255)"`
archived.NoPKModel
}