From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 19 May 2014 16:43:13 +0000 (+0200)
Subject: SONAR-5320 When hours in day property has been overload, some migrations are failing
X-Git-Tag: 4.4-RC1~1002
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3a59a9d59140aacd101b73efda65fe173b3f4d7b;p=sonarqube.git

SONAR-5320 When hours in day property has been overload, some migrations are failing
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb
index 95b215477bf..52e1e0a1dca 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/517_update_work_units_by_size_point_property_to_minutes.rb
@@ -30,7 +30,7 @@ class UpdateWorkUnitsBySizePointPropertyToMinutes < ActiveRecord::Migration
 
   def self.up
     hours_in_day_prop = Property.find_by_prop_key('sonar.technicalDebt.hoursInDay')
-    hours_in_day = hours_in_day_prop ? hours_in_day_prop : 8
+    hours_in_day = hours_in_day_prop && hours_in_day_prop.text_value ? hours_in_day_prop.text_value.to_i : 8
     work_units_by_size_point = Property.find_by_prop_key('workUnitsBySizePoint')
     if work_units_by_size_point && work_units_by_size_point.text_value && work_units_by_size_point.text_value.to_f
       work_units_by_size_point.text_value = convert_days_to_minutes(work_units_by_size_point.text_value.to_f, hours_in_day)
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb
index 8f377efe07b..ab98a590d40 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/518_update_conditions_on_debt_to_minutes.rb
@@ -34,7 +34,7 @@ class UpdateConditionsOnDebtToMinutes < ActiveRecord::Migration
 
   def self.up
     hours_in_day_prop = Property.find_by_prop_key('sonar.technicalDebt.hoursInDay')
-    hours_in_day = hours_in_day_prop ? hours_in_day_prop : 8
+    hours_in_day = hours_in_day_prop && hours_in_day_prop.text_value ? hours_in_day_prop.text_value.to_i : 8
 
     metrics = Metric.find(:all, :conditions => ['name in (?)', ['sqale_index', 'new_technical_debt',
                                                                 'sqale_effort_to_grade_a', 'sqale_effort_to_grade_b', 'sqale_effort_to_grade_c', 'sqale_effort_to_grade_d',
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb
index 6c4c80de504..ed1509cb1c7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/519_update_measure_filters_on_debt_to_minutes.rb
@@ -34,7 +34,7 @@ class UpdateMeasureFiltersOnDebtToMinutes < ActiveRecord::Migration
 
   def self.up
     hours_in_day_prop = Property.find_by_prop_key('sonar.technicalDebt.hoursInDay')
-    hours_in_day = hours_in_day_prop ? hours_in_day_prop : 8
+    hours_in_day = hours_in_day_prop && hours_in_day_prop.text_value ? hours_in_day_prop.text_value.to_i : 8
 
     filters = MeasureFilter.all(:conditions => "data LIKE '%_metric=sqale_index%' OR data LIKE '%_metric=new_technical_debt%'" +
         " OR data LIKE '%_metric=sqale_effort_to_grade_a%' OR data LIKE '%_metric=sqale_effort_to_grade_b%' OR data LIKE '%_metric=sqale_effort_to_grade_c%' " +