SONAR-5007 fix db migrations 538 and 539

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb
index 6333eac13635126e28bdffee4e0dccdbd46e16ee..bb363507ebb8c7f6e7568ae2c45b671ae0116602 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/538_add_dates_to_active_rules_table.rb
@@ -23,17 +23,11 @@
 #
 class AddDatesToActiveRulesTable < ActiveRecord::Migration
 
-  class ActiveRule < ActiveRecord::Base
-  end
-
   def self.up
-    now = Time.now
-    ActiveRule.find(:all).each do |active_rule|
-      active_rule.created_at=now
-      active_rule.updated_at=now
-      active_rule.save!
+    def self.up
+      add_column 'active_rules', :created_at, :datetime, :null => true
+      add_column 'active_rules', :updated_at, :datetime, :null => true
     end
   end
-
 end
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb
index 72ce86929c3370d45be70a4e40da49f2dde9c00b..1945bca7e61c3eb7748a518b98f8338261359473 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/539_insert_active_rule_dates.rb
@@ -23,8 +23,16 @@
 #
 class InsertActiveRuleDates < ActiveRecord::Migration
 
-  def self.up
+  class ActiveRule < ActiveRecord::Base
+  end
 
+  def self.up
+    now = Time.now
+    ActiveRule.find(:all).each do |active_rule|
+      active_rule.created_at=now
+      active_rule.updated_at=now
+      active_rule.save!
+    end
   end
 
 end