SONAR-7786 merge PROJECTS table clean migrations and do them earlier

21 files changed, 2 insertions, 30 deletions

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1255_fix_project_uuid_of_developer_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1221_clean_some_data_in_table_projects.rb
index 38cf8c1a960..092e14726fb 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1255_fix_project_uuid_of_developer_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1221_clean_some_data_in_table_projects.rb
@@ -21,9 +21,10 @@
 #
 # SonarQube 6.0
 #
-class FixProjectUuidOfDeveloperProjects < ActiveRecord::Migration
+class CleanSomeDataInTableProjects < ActiveRecord::Migration
 
   def self.up
     execute_java_migration('org.sonar.db.version.v60.FixProjectUuidOfDeveloperProjects')
+    execute_java_migration('org.sonar.db.version.v60.CleanUsurperRootComponents')
   end
 end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1221_add_uuid_columns_to_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1222_add_uuid_columns_to_projects.rb
index 95fa9837b59..95fa9837b59 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1221_add_uuid_columns_to_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1222_add_uuid_columns_to_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1222_populate_uuid_columns_of_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1223_populate_uuid_columns_of_projects.rb
index b67091182d3..b67091182d3 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1222_populate_uuid_columns_of_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1223_populate_uuid_columns_of_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1223_clean_orphan_rows_in_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1224_clean_orphan_rows_in_projects.rb
index 0f063102b03..0f063102b03 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1223_clean_orphan_rows_in_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1224_clean_orphan_rows_in_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1224_drop_index_projects_uuid_from_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1225_drop_index_projects_uuid_from_projects.rb
index 6305a0d80d6..6305a0d80d6 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1224_drop_index_projects_uuid_from_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1225_drop_index_projects_uuid_from_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1225_make_uuid_columns_not_null_on_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_make_uuid_columns_not_null_on_projects.rb
index 2db8db3f4ba..2db8db3f4ba 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1225_make_uuid_columns_not_null_on_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_make_uuid_columns_not_null_on_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_recreate_index_projects_uuid_from_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1227_recreate_index_projects_uuid_from_projects.rb
index f9f6fbad51c..f9f6fbad51c 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1226_recreate_index_projects_uuid_from_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1227_recreate_index_projects_uuid_from_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1227_drop_index_projects_root_id_from_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1228_drop_index_projects_root_id_from_projects.rb
index 038b01da20e..038b01da20e 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1227_drop_index_projects_root_id_from_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1228_drop_index_projects_root_id_from_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1228_drop_id_columns_from_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1229_drop_id_columns_from_projects.rb
index 6266cdad3fa..6266cdad3fa 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1228_drop_id_columns_from_projects.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1229_drop_id_columns_from_projects.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1229_add_uuid_column_to_snapshots.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1230_add_uuid_column_to_snapshots.rb
index 10d61c8e83e..10d61c8e83e 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1229_add_uuid_column_to_snapshots.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1230_add_uuid_column_to_snapshots.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1230_populate_uuid_column_on_snapshots.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1231_populate_uuid_column_on_snapshots.rb
index fe409fe9b39..fe409fe9b39 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1230_populate_uuid_column_on_snapshots.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1231_populate_uuid_column_on_snapshots.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1231_make_uuid_column_not_null_on_snapshots.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1232_make_uuid_column_not_null_on_snapshots.rb
index d7baeef61cd..d7baeef61cd 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1231_make_uuid_column_not_null_on_snapshots.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1232_make_uuid_column_not_null_on_snapshots.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1232_add_unique_index_on_uuid_of_snapshots.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1233_add_unique_index_on_uuid_of_snapshots.rb
index 5a66c1d7759..5a66c1d7759 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1232_add_unique_index_on_uuid_of_snapshots.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1233_add_unique_index_on_uuid_of_snapshots.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1233_add_analysis_uuid_column_to_ce_activity.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1234_add_analysis_uuid_column_to_ce_activity.rb
index 8f25ffedab8..8f25ffedab8 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1233_add_analysis_uuid_column_to_ce_activity.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1234_add_analysis_uuid_column_to_ce_activity.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1234_populate_analysis_uuid_column_on_ce_activity.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_populate_analysis_uuid_column_on_ce_activity.rb
index d2642bd9b6f..d2642bd9b6f 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1234_populate_analysis_uuid_column_on_ce_activity.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_populate_analysis_uuid_column_on_ce_activity.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_drop_snapshot_id_column_from_ce_activity.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_drop_snapshot_id_column_from_ce_activity.rb
index ff454ce01bb..ff454ce01bb 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1235_drop_snapshot_id_column_from_ce_activity.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_drop_snapshot_id_column_from_ce_activity.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_add_component_uuid_and_analysis_uuid_to_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_add_component_uuid_and_analysis_uuid_to_duplications_index.rb
index 6cd915e449f..6cd915e449f 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1236_add_component_uuid_and_analysis_uuid_to_duplications_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_add_component_uuid_and_analysis_uuid_to_duplications_index.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb
index 4e30c48a92f..4e30c48a92f 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1237_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_populate_component_uuid_and_analysis_uuid_of_duplications_index.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_delete_orphan_duplications_index_rows_without_component_or_analysis.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1239_delete_orphan_duplications_index_rows_without_component_or_analysis.rb
index a869ada9f28..a869ada9f28 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1238_delete_orphan_duplications_index_rows_without_component_or_analysis.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1239_delete_orphan_duplications_index_rows_without_component_or_analysis.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1239_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1240_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb
index ff6268c7e97..ff6268c7e97 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1239_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1240_make_component_uuid_and_analysis_uuid_not_null_on_duplications_index.rb
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1269_clean_usurper_root_components.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1269_clean_usurper_root_components.rb
deleted file mode 100644
index f77ee059214..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1269_clean_usurper_root_components.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 CleanUsurperRootComponents < ActiveRecord::Migration
-
-  def self.up
-    execute_java_migration('org.sonar.db.version.v60.CleanUsurperRootComponents')
-  end
-end