Do not ignore errors on creation of db index

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb
index f1b1741cb01e3645ab6823b985ab51bb1cb35a78..9885d253f77d16b63be49a7298d77727c7c66446 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/541_add_unique_index_on_active_rule_key.rb
@@ -54,11 +54,7 @@ class AddUniqueIndexOnActiveRuleKey < ActiveRecord::Migration
       end
     end
 
-    begin
-      add_index :active_rules, [:profile_id, :rule_id], :name => 'uniq_profile_rule_ids', :unique => true
-    rescue
-      # already exists
-    end
+    add_index :active_rules, [:profile_id, :rule_id], :name => 'uniq_profile_rule_ids', :unique => true
   end
 
 end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb
index 38baa2043268aadbf44ca02137bb012f9d932059..9f9c1f4414dded2bf0c93546c0287e6f04e60b0c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/542_add_index_on_snapshot_data_resource_id.rb
@@ -25,11 +25,7 @@
 class AddIndexOnSnapshotDataResourceId < ActiveRecord::Migration
 
   def self.up
-    begin
-      add_index :snapshot_data, :resource_id, :name => 'snap_data_resource_id'
-    rescue
-      # already exists
-    end
+    add_index :snapshot_data, :resource_id, :name => 'snap_data_resource_id'
   end
 
 end