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 a9c2cc8f270940924e73aed8874a9a8aa8bdefb6 Author: abeizn <[email protected]> AuthorDate: Wed Oct 19 19:36:20 2022 +0800 fix: some tables don't exist when devlake run in a new database --- impl/dalgorm/dalgorm.go | 2 +- models/migrationscripts/20220903_encrypt_blueprint.go | 8 -------- models/migrationscripts/20220904_encrypt_pipeline.go | 8 -------- .../migrationscripts/20220913_fix_commitfile_id_toolong.go | 12 ------------ .../jira/models/migrationscripts/20220716_add_init_tables.go | 8 -------- 5 files changed, 1 insertion(+), 37 deletions(-) diff --git a/impl/dalgorm/dalgorm.go b/impl/dalgorm/dalgorm.go index 1ffb3e27..502017a2 100644 --- a/impl/dalgorm/dalgorm.go +++ b/impl/dalgorm/dalgorm.go @@ -84,7 +84,7 @@ func (d *Dalgorm) AutoMigrate(entity interface{}, clauses ...dal.Clause) errors. err := errors.Convert(buildTx(d.db, clauses).AutoMigrate(entity)) if err == nil { // fix pg cache plan error - _ = d.db.Limit(1).Find(entity) + _ = d.First(entity, clauses...) } return err } diff --git a/models/migrationscripts/20220903_encrypt_blueprint.go b/models/migrationscripts/20220903_encrypt_blueprint.go index 7235ace8..c5171bc1 100644 --- a/models/migrationscripts/20220903_encrypt_blueprint.go +++ b/models/migrationscripts/20220903_encrypt_blueprint.go @@ -41,10 +41,6 @@ type Blueprint20220903Before struct { archived.Model `swaggerignore:"true"` } -func (Blueprint20220903Before) TableName() string { - return "_devlake_blueprints" -} - type Blueprint20220903After struct { /* unchanged part */ Name string `json:"name" validate:"required"` @@ -58,10 +54,6 @@ type Blueprint20220903After struct { Settings string `json:"settings"` } -func (Blueprint20220903After) TableName() string { - return "_devlake_blueprints" -} - func (script *encryptBlueprint) Up(basicRes core.BasicRes) errors.Error { encKey := basicRes.GetConfig(core.EncodeKeyEnvStr) if encKey == "" { diff --git a/models/migrationscripts/20220904_encrypt_pipeline.go b/models/migrationscripts/20220904_encrypt_pipeline.go index 46c0713e..9f64dd86 100644 --- a/models/migrationscripts/20220904_encrypt_pipeline.go +++ b/models/migrationscripts/20220904_encrypt_pipeline.go @@ -47,10 +47,6 @@ type Pipeline20220904Before struct { Stage int `json:"stage"` } -func (Pipeline20220904Before) TableName() string { - return "_devlake_pipelines" -} - type Pipeline0904After struct { common.Model Name string `json:"name" gorm:"index"` @@ -66,10 +62,6 @@ type Pipeline0904After struct { Stage int `json:"stage"` } -func (Pipeline0904After) TableName() string { - return "_devlake_pipelines" -} - func (script *encryptPipeline) Up(basicRes core.BasicRes) errors.Error { encKey := basicRes.GetConfig(core.EncodeKeyEnvStr) if encKey == "" { diff --git a/models/migrationscripts/20220913_fix_commitfile_id_toolong.go b/models/migrationscripts/20220913_fix_commitfile_id_toolong.go index 904fa746..7374d269 100644 --- a/models/migrationscripts/20220913_fix_commitfile_id_toolong.go +++ b/models/migrationscripts/20220913_fix_commitfile_id_toolong.go @@ -38,30 +38,18 @@ type commitFile20220913Before struct { FilePath string `gorm:"type:varchar(255)"` // target field } -func (commitFile20220913Before) TableName() string { - return "commit_files" -} - type commitFile20220913After struct { archived.DomainEntity CommitSha string `gorm:"type:varchar(40)"` FilePath string `gorm:"type:text"` // target field } -func (commitFile20220913After) TableName() string { - return "commit_files" -} - type commitFileComponent20220913 struct { archived.NoPKModel CommitFileId string `gorm:"primaryKey;type:varchar(255)"` ComponentName string `gorm:"type:varchar(255)"` } -func (commitFileComponent20220913) TableName() string { - return "commit_file_components" -} - func (script *fixCommitFileIdTooLong) Up(basicRes core.BasicRes) errors.Error { // To recalculate the primary key values for the `commit_files` since // we used the `FilePath` as part of the primary key which would exceed diff --git a/plugins/jira/models/migrationscripts/20220716_add_init_tables.go b/plugins/jira/models/migrationscripts/20220716_add_init_tables.go index cee22c6f..87445a22 100644 --- a/plugins/jira/models/migrationscripts/20220716_add_init_tables.go +++ b/plugins/jira/models/migrationscripts/20220716_add_init_tables.go @@ -34,10 +34,6 @@ type jiraConnection20220716After struct { archived.BasicAuth `mapstructure:",squash"` } -func (jiraConnection20220716After) TableName() string { - return "_tool_jira_connections" -} - type jiraConnection20220716Before struct { ID uint64 `gorm:"primaryKey" json:"id"` CreatedAt time.Time `json:"createdAt"` @@ -52,10 +48,6 @@ type jiraConnection20220716Before struct { RateLimit int `comment:"api request rate limt per hour" json:"rateLimit"` } -func (jiraConnection20220716Before) TableName() string { - return "_tool_jira_connections" -} - type addInitTables20220716 struct{} func (script *addInitTables20220716) Up(basicRes core.BasicRes) errors.Error {
