Fix db migration on rules_parameters

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb
index 151b70239c128df826f8ffe965d74406404fe09d..ff7ff46c8fa0579e02b7bfe81fb49f56345f6f28 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb
@@ -115,6 +115,7 @@ class InitialSchema < ActiveRecord::Migration
       t.column :name,                :string,    :null => false, :limit => 128
       t.column :description,         :string,    :null => true, :limit => 4000
       t.column :param_type,          :string,    :null => false, :limit => 512
+      t.column :default_value,       :string, :null => true, :limit => 4000
     end
 
     create_table :project_links do |t|

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb
index 7f82e947147d62661ed058294b703289e7189faa..18710f6a68084b8d008f4c31adbf01e631a4762e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/014_create_rules_profiles.rb
@@ -37,7 +37,6 @@ class CreateRulesProfiles < ActiveRecord::Migration
       t.column :active_rule_id,     :integer,   :null => false
       t.column :rules_parameter_id,  :integer,   :null => false
       t.column :value,               :string,    :limit => 4000, :null => true
-      t.column :default_value, :string, :null => true, :limit => 4000
     end
   end
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb
index 57945d2d499966b0bbeba2119f930dd81a2f9782..74710591d2eadc723f8cc797739c27aa58bd8be2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/526_remove_active_dashboards_linked_on_unshared_dashboards.rb
@@ -32,6 +32,7 @@ class RemoveActiveDashboardsLinkedOnUnsharedDashboards < ActiveRecord::Migration
   end
 
   def self.up
+    Dashboard.reset_column_information
     ActiveDashboard.reset_column_information
 
     # Delete every active_dashboards linked on unshared dashboard not owned by the user