Skip to content

[fix-5697][Pydevlake]: Fix AddColumn op possibly deleting a column #5714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klesh merged 3 commits into from
Jul 24, 2023
Merged

[fix-5697][Pydevlake]: Fix AddColumn op possibly deleting a column #5714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cb9c0a
fix: fixed AddColumn op deleting the column if it already exists
Jul 20, 2023
2c6c3aa
fix: RunAutoMigrations now only creates tables if they don't exist to…
Jul 20, 2023
01bbb0d
fix: add new migration for entities column addition to force-retrigge…
Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions backend/python/plugins/azuredevops/azuredevops/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ def add_build_id_as_job_primary_key(b: MigrationScriptBuilder):
@migration(20230606165630)
def rename_tx_rule_table_to_scope_config(b: MigrationScriptBuilder):
b.rename_table('_tool_azuredevops_azuredevopstransformationrules', GitRepositoryConfig.__tablename__)


@migration(20230607165630, name="add entities column to gitrepositoryconfig table")
def add_entities_column_to_scope_config(b: MigrationScriptBuilder):
b.add_column(GitRepositoryConfig.__tablename__, 'entities', 'json')


Expand Down
9 changes: 6 additions & 3 deletions backend/server/services/remote/models/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ type AddColumnOperation struct {

func (o AddColumnOperation) Execute(dal dal.Dal) errors.Error {
if dal.HasColumn(o.Table, o.Column) {
return dal.DropColumns(o.Table, o.Column)
err := dal.DropColumns(o.Table, o.Column)
if err != nil {
return err
}
}
return dal.AddColumn(o.Table, o.Column, o.ColumnType)
}
Expand Down Expand Up @@ -162,9 +165,9 @@ func (s *RemoteMigrationScript) UnmarshalJSON(data []byte) error {
}

func (s *RemoteMigrationScript) Up(basicRes context.BasicRes) errors.Error {
dal := basicRes.GetDal()
db := basicRes.GetDal()
for _, operation := range s.operations {
err := operation.Execute(dal)
err := operation.Execute(db)
if err != nil {
return err
}
Expand Down
17 changes: 12 additions & 5 deletions backend/server/services/remote/plugin/plugin_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,28 +231,35 @@ func (p *remotePluginImpl) ApiResources() map[string]map[string]plugin.ApiResour
}

func (p *remotePluginImpl) RunAutoMigrations() errors.Error {
db := basicRes.GetDal()
err := api.CallDB(db.AutoMigrate, p.connectionTabler.New())
err := p.createTable(p.connectionTabler.New())
if err != nil {
return err
}
err = api.CallDB(db.AutoMigrate, p.scopeTabler.New())
err = p.createTable(p.scopeTabler.New())
if err != nil {
return err
}
err = api.CallDB(db.AutoMigrate, p.scopeConfigTabler.New())
err = p.createTable(p.scopeConfigTabler.New())
if err != nil {
return err
}
for _, toolModelTabler := range p.toolModelTablers {
err = api.CallDB(db.AutoMigrate, toolModelTabler.New())
err = p.createTable(toolModelTabler.New())
if err != nil {
return err
}
}
return nil
}

func (p *remotePluginImpl) createTable(tbl coreModels.DynamicTabler) errors.Error {
Copy link
Copy Markdown
Contributor

@CamilleTeruel CamilleTeruel Jul 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change disables all automigrations but table creation, and I thought we settled on adding a CreateTable op instead?

Copy link
Copy Markdown
Contributor Author

@keon94 keon94 Jul 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not in this ticket. I'll handle that in #5689. For now, we create tables like this, and every other migration is done manually

db := basicRes.GetDal()
if db.HasTable(tbl.TableName()) {
return nil
}
return api.CallDB(db.AutoMigrate, tbl)
}

func (p *remotePluginImpl) OpenApiSpec() string {
return p.openApiSpec
}
Expand Down