SONAR-7786 compress DUPLICATIONS_INDEX migrations

8 files changed, 8 insertions, 124 deletions

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_add_component_uuid_to_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb
index 0631d125f25..6cd915e449f 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_add_component_uuid_to_duplications_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_add_component_uuid_and_analysis_uuid_to_duplications_index.rb
@@ -21,9 +21,9 @@
 #
 # SonarQube 6.0
 #
-class AddComponentUuidToDuplicationsIndex < ActiveRecord::Migration
+class AddComponentUuidAndAnalysisUuidToDuplicationsIndex < ActiveRecord::Migration
 
   def self.up
-    execute_java_migration('org.sonar.db.version.v60.AddComponentUuidColumnToDuplicationsIndex')
+    execute_java_migration('org.sonar.db.version.v60.AddComponentUuidAndAnalysisUuidColumnToDuplicationsIndex')
   end
 end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_populate_component_uuid_of_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb
index 28a53abc300..4e30c48a92f 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_populate_component_uuid_of_duplications_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb
@@ -21,9 +21,9 @@
 #
 # SonarQube 6.0
 #
-class PopulateComponentUuidOfDuplicationsIndex < ActiveRecord::Migration
+class PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex < ActiveRecord::Migration
 
   def self.up
-    execute_java_migration('org.sonar.db.version.v60.PopulateComponentUuidOfDuplicationsIndex')
+    execute_java_migration('org.sonar.db.version.v60.PopulateComponentUuidAndAnalysisUuidOfDuplicationsIndex')
   end
 end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_delete_orphan_duplications_index_rows_without_component.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_delete_orphan_duplications_index_rows_without_component.rb
deleted file mode 100644
index 1d78fcb7340..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_delete_orphan_duplications_index_rows_without_component.rb
+++ /dev/null
@@ -1,29 +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.
-#
-
-#
-# SonarQube 6.0
-#
-class DeleteOrphanDuplicationsIndexRowsWithoutComponent < ActiveRecord::Migration
-
-  def self.up
-    execute_java_migration('org.sonar.db.version.v60.DeleteOrphanDuplicationsIndexRowsWithoutComponent')
-  end
-end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1241_delete_orphan_duplications_index_rows_without_analysis.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb
index cf42ef85db7..a869ada9f28 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1241_delete_orphan_duplications_index_rows_without_analysis.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_delete_orphan_duplications_index_rows_without_component_or_analysis.rb
@@ -21,9 +21,9 @@
 #
 # SonarQube 6.0
 #
-class DeleteOrphanDuplicationsIndexRowsWithoutAnalysis < ActiveRecord::Migration
+class DeleteOrphanDuplicationsIndexRowsWithoutComponentOrAnalysis < ActiveRecord::Migration
 
   def self.up
-    execute_java_migration('org.sonar.db.version.v60.DeleteOrphanDuplicationsIndexRowsWithoutAnalysis')
+    execute_java_migration('org.sonar.db.version.v60.DeleteOrphanDuplicationsIndexRowsWithoutComponentOrAnalysis')
   end
 end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1242_make_analysis_uuid_not_null_on_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb
index dfb335e57ba..ff6268c7e97 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1242_make_analysis_uuid_not_null_on_duplications_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb
@@ -21,10 +21,10 @@
 #
 # SonarQube 6.0
 #
-class MakeAnalysisUuidNotNullOnDuplicationsIndex < ActiveRecord::Migration
+class MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex < ActiveRecord::Migration
 
   def self.up
-    execute_java_migration('org.sonar.db.version.v60.MakeAnalysisUuidNotNullOnDuplicationsIndex')
+    execute_java_migration('org.sonar.db.version.v60.MakeComponentUuidAndAnalysisUuidNotNullOnDuplicationsIndex')
 
     add_index :duplications_index, [:analysis_uuid, :component_uuid], :name => 'duplication_analysis_component'
   end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_make_component_uuid_not_null_on_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_make_component_uuid_not_null_on_duplications_index.rb
deleted file mode 100644
index a9c235b4557..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_make_component_uuid_not_null_on_duplications_index.rb
+++ /dev/null
@@ -1,29 +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.
-#
-
-#
-# SonarQube 6.0
-#
-class MakeComponentUuidNotNullOnDuplicationsIndex < ActiveRecord::Migration
-
-  def self.up
-    execute_java_migration('org.sonar.db.version.v60.MakeComponentUuidNotNullOnDuplicationsIndex')
-  end
-end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1239_add_analysis_uuid_to_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1239_add_analysis_uuid_to_duplications_index.rb
deleted file mode 100644
index a3154d5155b..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1239_add_analysis_uuid_to_duplications_index.rb
+++ /dev/null
@@ -1,29 +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.
-#
-
-#
-# SonarQube 6.0
-#
-class AddAnalysisUuidToDuplicationsIndex < ActiveRecord::Migration
-
-  def self.up
-    execute_java_migration('org.sonar.db.version.v60.AddAnalysisUuidColumnToDuplicationsIndex')
-  end
-end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1240_populate_analysis_uuid_of_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1240_populate_analysis_uuid_of_duplications_index.rb
deleted file mode 100644
index b760ef1c1a0..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1240_populate_analysis_uuid_of_duplications_index.rb
+++ /dev/null
@@ -1,29 +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.
-#
-
-#
-# SonarQube 6.0
-#
-class PopulateAnalysisUuidOfDuplicationsIndex < ActiveRecord::Migration
-
-  def self.up
-    execute_java_migration('org.sonar.db.version.v60.PopulateAnalysisUuidOfDuplicationsIndex')
-  end
-end