Remove some useless begin / end in some rails migration

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/543_add_type_to_log_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/543_add_type_to_log_table.rb
index ed139ac8bb187909d2c0bfd2a9e17cf74f5e951f..5d8d073167bf884293dac21a5789f0952319dd47 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/543_add_type_to_log_table.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/543_add_type_to_log_table.rb
@@ -25,11 +25,9 @@
 class AddTypeToLogTable < ActiveRecord::Migration
 
   def self.up
-    begin
-      remove_column 'logs', 'payload_field'
-      add_column 'logs', 'log_type', :string, :limit => 50
-      add_column 'logs', 'log_message', :string
-    end
+    remove_column 'logs', 'payload_field'
+    add_column 'logs', 'log_type', :string, :limit => 50
+    add_column 'logs', 'log_message', :string
   end
 
 end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb
index c53eeeb1996f61dcadec26e6d73d3c5b1e568e5d..fd63a556360ea496c3f70cb065423a88c6e8cb09 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/544_rename_rules_parent_id_to_template_id.rb
@@ -25,9 +25,7 @@
 class RenameRulesParentIdToTemplateId < ActiveRecord::Migration
 
   def self.up
-    begin
-      rename_column 'rules', 'parent_id', 'template_id'
-    end
+    rename_column 'rules', 'parent_id', 'template_id'
   end
 
 end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb
index d27d1346afed7697bd299fb87b117c5d8ffa8567..c8203cba112458385f9f9cd717d0490051a3dd7a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/545_rename_rules_cardinality_to_is_template.rb
@@ -28,15 +28,13 @@ class RenameRulesCardinalityToIsTemplate < ActiveRecord::Migration
   end
 
   def self.up
-    begin
-      add_column 'rules', 'is_template', :boolean, :null => false, :default => false
-      Rule.reset_column_information
-      Rule.all.each do |r|
-        r.is_template = r.cardinality == 'MULTIPLE'
-        r.save!
-      end
-      remove_column 'rules', 'cardinality'
+    add_column 'rules', 'is_template', :boolean, :null => false, :default => false
+    Rule.reset_column_information
+    Rule.all.each do |r|
+      r.is_template = r.cardinality == 'MULTIPLE'
+      r.save!
     end
+    remove_column 'rules', 'cardinality'
   end
 
 end