SONAR-6716 Compress migrations of table action_plans

3 files changed, 2 insertions, 62 deletions

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb
index 34dc67f6c42..e5cbc676bee 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/238_create_action_plans.rb
@@ -28,10 +28,11 @@ class CreateActionPlans < ActiveRecord::Migration
       t.timestamps
       t.column 'name',          :string,      :null => true,    :limit => 200
       t.column 'description',   :string,      :null => true,    :limit => 1000
-      t.column 'dead_line',     :datetime,    :null => true
+      t.column 'deadline',     :datetime,    :null => true
       t.column 'user_login',    :string,      :null => true,    :limit => 40
       t.column 'project_id',    :integer,     :null => true
       t.column 'status',        :string,      :null => true,    :limit => 10
+      t.column 'kee',           :string,      :null => true,    :limit => 100
     end
     alter_to_big_primary_key('action_plans')
 
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/259_rename_action_plans_deadline.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/259_rename_action_plans_deadline.rb
deleted file mode 100644
index 4c7664f4c41..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/259_rename_action_plans_deadline.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.14
-#
-class RenameActionPlansDeadline < ActiveRecord::Migration
-
-  def self.up
-    rename_column(:action_plans, :dead_line, :deadline)
-  end
-
-end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/394_add_key_to_action_plan.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/394_add_key_to_action_plan.rb
deleted file mode 100644
index edcf5bf1591..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/394_add_key_to_action_plan.rb
+++ /dev/null
@@ -1,31 +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 3.6
-#
-class AddKeyToActionPlan < ActiveRecord::Migration
-
-  def self.up
-    add_column 'action_plans', 'kee', :string, :null => true, :limit => 100
-  end
-
-end
-