Skip to content

Commit 7f7cf09

Browse files
frederic-huebnerFrederic Hübner
andauthored
fix(sonarqube): tolerate missing migration indexes (apache#9012)
Co-authored-by: Frederic Hübner <frederichuebner@ip-192-168-1-223.eu-central-1.compute.internal>
1 parent 21ea61c commit 7f7cf09

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

backend/impls/dalgorm/dalgorm.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,9 @@ func (d *Dalgorm) RenameTable(oldName, newName string) errors.Error {
453453
// DropIndexes drops indexes for specified table
454454
func (d *Dalgorm) DropIndexes(table string, indexNames ...string) errors.Error {
455455
for _, indexName := range indexNames {
456+
if !d.db.Migrator().HasIndex(table, indexName) {
457+
continue
458+
}
456459
err := d.db.Migrator().DropIndex(table, indexName)
457460
if err != nil {
458461
return d.convertGormError(err)

backend/plugins/sonarqube/e2e/issue_code_block_long_component_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ func TestSonarqubeIssueCodeBlockLongComponent(t *testing.T) {
8080
&sonarqubeIssueCodeBlockBeforeText{},
8181
&cqIssueCodeBlockBeforeText{},
8282
))
83+
require.NoError(t, dataflowTester.Db.Migrator().DropIndex(
84+
"cq_issue_code_blocks", "idx_cq_issue_code_blocks_component",
85+
))
86+
require.NoError(t, dataflowTester.Db.Migrator().DropIndex(
87+
"_tool_sonarqube_issue_code_blocks", "idx__tool_sonarqube_issue_code_blocks_component",
88+
))
8389

8490
existingComponent := "existing:component"
8591
require.NoError(t, dataflowTester.Db.Create(&sonarqubeIssueCodeBlockBeforeText{

0 commit comments

Comments
 (0)