SONAR-6716 Compress migrations of table project_measures

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb
index 5d3b7883a947c30b9fdb892d239174f3146366ca..b15f0d85218ec16d0239150c90421c947c939baa 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb
@@ -82,6 +82,8 @@ class InitialSchema < ActiveRecord::Migration
       t.column :diff_value_1, :decimal, :null => true, :precision => 30, :scale => 20
       t.column :diff_value_2, :decimal, :null => true, :precision => 30, :scale => 20
       t.column :diff_value_3, :decimal, :null => true, :precision => 30, :scale => 20
+      t.column :characteristic_id, :integer, :null => true
+      t.column 'person_id', :integer, :null => true
     end
 
     create_table :rules do |t|

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/132_add_characteristic_id_to_measures.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/132_add_characteristic_id_to_measures.rb
deleted file mode 100644 (file)
index 741b8dc..0000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/132_add_characteristic_id_to_measures.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.3
-#
-class AddCharacteristicIdToMeasures < ActiveRecord::Migration
-
-  def self.up
-     add_column :project_measures, :characteristic_id, :integer, :null => true
-  end
-
-end

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/256_add_measures_person.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/256_add_measures_person.rb
deleted file mode 100644 (file)
index 71015cd..0000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/256_add_measures_person.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 AddMeasuresPerson < ActiveRecord::Migration
-
-  def self.up
-       add_column 'project_measures', 'person_id', :integer, :null => true
-  end
-
-end