SONAR-7738 ensure remove_index is reentrant

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1205_drop_resource_index_rid_from_resource_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1205_drop_resource_index_rid_from_resource_index.rb
index e44007e7046b93eaf1bde8d183051e2b83a7393a..edc42e1cfcef86723c86f8f322abc769443ca6c2 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1205_drop_resource_index_rid_from_resource_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1205_drop_resource_index_rid_from_resource_index.rb
@@ -24,6 +24,10 @@
 class DropResourceIndexRidFromResourceIndex < ActiveRecord::Migration
 
   def self.up
-    remove_index :resource_index, :name => 'resource_index_rid'
+    begin
+      remove_index :resource_index, :name => 'resource_index_rid'
+    rescue
+      #ignore
+    end
   end
 end

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1212_drop_snapshot_project_id_from_snapshots.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1212_drop_snapshot_project_id_from_snapshots.rb
index 6b0588494bfc2190c69682da0513c66bf573d38f..3bc97373bcec0099972a042953bb12ff5e061c60 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1212_drop_snapshot_project_id_from_snapshots.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1212_drop_snapshot_project_id_from_snapshots.rb
@@ -24,7 +24,15 @@
 class DropSnapshotProjectIdFromSnapshots < ActiveRecord::Migration
 
   def self.up
-    remove_index :snapshots, :name => 'snapshot_project_id'
-    remove_index :snapshots, :name => 'snapshots_root_project_id'
+    begin
+      remove_index :snapshots, :name => 'snapshot_project_id'
+    rescue
+      #ignore
+    end
+    begin
+      remove_index :snapshots, :name => 'snapshots_root_project_id'
+    rescue
+      #ignore
+    end
   end
 end

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_drop_index_projects_root_id_from_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_drop_index_projects_root_id_from_projects.rb
index bb859a82616dbcf873d7bbe5fdf72e5e3a6eb734..038b01da20e30a75d9e06b370cd27f2dd3c97f6e 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_drop_index_projects_root_id_from_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_drop_index_projects_root_id_from_projects.rb
@@ -24,6 +24,10 @@
 class DropIndexProjectsRootIdFromProjects < ActiveRecord::Migration
 
   def self.up
-    remove_index :projects, :name => 'projects_root_id'
+    begin
+      remove_index :projects, :name => 'projects_root_id'
+    rescue
+      #ignore
+    end
   end
 end