SONAR-6716 Compress migrations of table widget_properties

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb
index ac3d842ed421125e9c3c058d82f92796cf672501..ac49f690808df4878e191e610eefd40386641713 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/151_create_dashboards.rb
@@ -58,7 +58,6 @@ class CreateDashboards < ActiveRecord::Migration
       t.column :widget_id, :integer, :null => false
       t.column :kee, :string, :null => true, :limit => 100
       t.column :text_value, :string, :null => true, :limit => 4000
-      t.column :value_type, :string, :null => true, :limit => 20
     end
     add_index :widget_properties, [:widget_id], :name => 'widget_properties_widgets'
   end

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/236_delete_value_type_from_widget_properties.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/236_delete_value_type_from_widget_properties.rb
deleted file mode 100644 (file)
index 2aa3db2..0000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/236_delete_value_type_from_widget_properties.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# SonarQube, open source software quality management tool.
-# Copyright (C) 2008-2014 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# SonarQube is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# SonarQube is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-#
-# Sonar 2.13
-#
-class DeleteValueTypeFromWidgetProperties < ActiveRecord::Migration
-
-  def self.up
-    remove_column('widget_properties', 'value_type')
-  end
-
-end