aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-08-09 13:09:32 +0200
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-08-10 18:17:07 +0200
commitfd96c6fd9bbaca53c0e8cb914525f3e043bc23ee (patch)
tree5d2e1be5640afa77fcc8af7338720496bd919fd1
parentc12f3d56cb99478c36242fd122258ebf0d26f740 (diff)
downloadsonarqube-fd96c6fd9bbaca53c0e8cb914525f3e043bc23ee.tar.gz
sonarqube-fd96c6fd9bbaca53c0e8cb914525f3e043bc23ee.zip
SONAR_7958 add column PROJECTS.B_UUID_PATH
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1304_shrink_module_uuid_path_and_add_b_uuid_path_to_projects.rb30
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java7
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v61/AddBUuidPathToProjects.java44
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v61/ShrinkModuleUuidPathOfProjects.java44
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql1
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl3
-rw-r--r--sonar-db/src/test/java/org/sonar/db/component/ResourceDaoTest.java9
-rw-r--r--sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java2
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml1
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml1
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml7
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml7
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml8
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml1
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml1
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml3
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components.xml3
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml3
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml3
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteProject.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml1
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml1
26 files changed, 197 insertions, 13 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1304_shrink_module_uuid_path_and_add_b_uuid_path_to_projects.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1304_shrink_module_uuid_path_and_add_b_uuid_path_to_projects.rb
new file mode 100644
index 00000000000..f79599b56da
--- /dev/null
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1304_shrink_module_uuid_path_and_add_b_uuid_path_to_projects.rb
@@ -0,0 +1,30 @@
+#
+# 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.1
+#
+class ShrinkModuleUuidPathAndAddBUuidPathToProjects < ActiveRecord::Migration
+
+ def self.up
+ execute_java_migration('org.sonar.db.version.v61.ShrinkModuleUuidPathOfProjects')
+ execute_java_migration('org.sonar.db.version.v61.AddBUuidPathToProjects')
+ end
+end
diff --git a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
index 9a21f9dcb5b..02f844129dd 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
@@ -30,7 +30,7 @@ import org.sonar.db.MyBatis;
public class DatabaseVersion {
- public static final int LAST_VERSION = 1_303;
+ public static final int LAST_VERSION = 1_304;
/**
* The minimum supported version which can be upgraded. Lower
diff --git a/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java b/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
index 83cef386038..634e51128b8 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
@@ -144,9 +144,11 @@ import org.sonar.db.version.v60.PopulateUuidColumnsOfProjects;
import org.sonar.db.version.v60.PopulateUuidColumnsOfResourceIndex;
import org.sonar.db.version.v60.PopulateUuidPathColumnOnProjects;
import org.sonar.db.version.v60.RemoveUsersPasswordWhenNotLocal;
+import org.sonar.db.version.v61.AddBUuidPathToProjects;
import org.sonar.db.version.v61.DeleteProjectDashboards;
import org.sonar.db.version.v61.DeleteReportsFromCeQueue;
import org.sonar.db.version.v61.DropIsGlobalFromDashboards;
+import org.sonar.db.version.v61.ShrinkModuleUuidPathOfProjects;
public class MigrationStepModule extends Module {
@Override
@@ -312,7 +314,8 @@ public class MigrationStepModule extends Module {
// 6.1
DeleteProjectDashboards.class,
DropIsGlobalFromDashboards.class,
- DeleteReportsFromCeQueue.class
- );
+ DeleteReportsFromCeQueue.class,
+ ShrinkModuleUuidPathOfProjects.class,
+ AddBUuidPathToProjects.class);
}
}
diff --git a/sonar-db/src/main/java/org/sonar/db/version/v61/AddBUuidPathToProjects.java b/sonar-db/src/main/java/org/sonar/db/version/v61/AddBUuidPathToProjects.java
new file mode 100644
index 00000000000..7cab0d6adce
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/version/v61/AddBUuidPathToProjects.java
@@ -0,0 +1,44 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.
+ */
+package org.sonar.db.version.v61;
+
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.db.version.AddColumnsBuilder;
+import org.sonar.db.version.DdlChange;
+
+import static org.sonar.db.version.VarcharColumnDef.newVarcharColumnDefBuilder;
+
+public class AddBUuidPathToProjects extends DdlChange {
+
+ private static final String TABLE_PROJECTS = "projects";
+
+ public AddBUuidPathToProjects(Database db) {
+ super(db);
+ }
+
+ @Override
+ public void execute(Context context) throws SQLException {
+ context.execute(new AddColumnsBuilder(getDatabase().getDialect(), TABLE_PROJECTS)
+ .addColumn(newVarcharColumnDefBuilder().setColumnName("b_uuid_path").setLimit(1500).setIsNullable(true).build())
+ .build());
+ }
+
+}
diff --git a/sonar-db/src/main/java/org/sonar/db/version/v61/ShrinkModuleUuidPathOfProjects.java b/sonar-db/src/main/java/org/sonar/db/version/v61/ShrinkModuleUuidPathOfProjects.java
new file mode 100644
index 00000000000..3c856023f23
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/version/v61/ShrinkModuleUuidPathOfProjects.java
@@ -0,0 +1,44 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.
+ */
+package org.sonar.db.version.v61;
+
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.db.version.AlterColumnsBuilder;
+import org.sonar.db.version.DdlChange;
+
+import static org.sonar.db.version.VarcharColumnDef.newVarcharColumnDefBuilder;
+
+public class ShrinkModuleUuidPathOfProjects extends DdlChange {
+
+ private static final String TABLE_PROJECTS = "projects";
+
+ public ShrinkModuleUuidPathOfProjects(Database db) {
+ super(db);
+ }
+
+ @Override
+ public void execute(Context context) throws SQLException {
+ context.execute(new AlterColumnsBuilder(getDatabase().getDialect(), TABLE_PROJECTS)
+ .updateColumn(newVarcharColumnDefBuilder().setColumnName("module_uuid_path").setLimit(1500).setIsNullable(true).build())
+ .build());
+ }
+
+}
diff --git a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
index 86e4ace840e..ffaa80ac87f 100644
--- a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
+++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
@@ -490,6 +490,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1300');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1301');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1302');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1303');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1304');
INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482');
ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index 15fca8d0a79..a169a2673db 100644
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -215,7 +215,7 @@ CREATE TABLE "PROJECTS" (
"ROOT_UUID" VARCHAR(50) NOT NULL,
"PROJECT_UUID" VARCHAR(50),
"MODULE_UUID" VARCHAR(50),
- "MODULE_UUID_PATH" VARCHAR(4000),
+ "MODULE_UUID_PATH" VARCHAR(1500),
"NAME" VARCHAR(2000),
"DESCRIPTION" VARCHAR(2000),
"ENABLED" BOOLEAN NOT NULL DEFAULT TRUE,
@@ -233,6 +233,7 @@ CREATE TABLE "PROJECTS" (
"B_COPY_COMPONENT_UUID" VARCHAR(50),
"B_DESCRIPTION" VARCHAR(2000),
"B_ENABLED" BOOLEAN,
+ "B_UUID_PATH" VARCHAR(1500),
"B_LANGUAGE" VARCHAR(20),
"B_LONG_NAME" VARCHAR(500),
"B_MODULE_UUID" VARCHAR(50),
diff --git a/sonar-db/src/test/java/org/sonar/db/component/ResourceDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ResourceDaoTest.java
index 60bd033b741..b3dceba464e 100644
--- a/sonar-db/src/test/java/org/sonar/db/component/ResourceDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/component/ResourceDaoTest.java
@@ -19,11 +19,9 @@
*/
package org.sonar.db.component;
-import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nullable;
import org.junit.Rule;
import org.junit.Test;
import org.sonar.api.component.Component;
@@ -156,11 +154,6 @@ public class ResourceDaoTest {
}
private List<String> getKeys(final List<Component> components) {
- return newArrayList(Iterables.transform(components, new Function<Component, String>() {
- @Override
- public String apply(@Nullable Component input) {
- return input.key();
- }
- }));
+ return newArrayList(Iterables.transform(components, Component::key));
}
}
diff --git a/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
index cd190a68543..634666429cc 100644
--- a/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
@@ -29,6 +29,6 @@ public class MigrationStepModuleTest {
public void verify_count_of_added_MigrationStep_types() {
ComponentContainer container = new ComponentContainer();
new MigrationStepModule().configure(container);
- assertThat(container.size()).isEqualTo(129);
+ assertThat(container.size()).isEqualTo(131);
}
}
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml
index 1ea48523c8c..7053786e415 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert-result.xml
@@ -25,6 +25,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml
index b374ecfc7dd..a3f248d00f8 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/insert_disabled_component-result.xml
@@ -25,6 +25,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml
index 2c9b3eecd3d..4ad2d582d2e 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shared.xml
@@ -24,6 +24,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -58,6 +59,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -91,6 +93,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -124,6 +127,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -158,6 +162,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -191,6 +196,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -224,6 +230,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -258,6 +265,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml
index 7548d17dd93..1fce429fcb3 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKey-result.xml
@@ -26,6 +26,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -62,6 +63,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -97,6 +99,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -132,6 +135,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -168,6 +172,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -203,6 +208,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -238,6 +244,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -274,6 +281,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml
index ced8067f823..bdd706a48dc 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldBulkUpdateKeyOnOnlyOneSubmodule-result.xml
@@ -26,6 +26,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -62,6 +63,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -97,6 +99,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -132,6 +135,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -168,6 +172,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -203,6 +208,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -238,6 +244,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -274,6 +281,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml
index e789eff392b..200d61c2d26 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules-result.xml
@@ -26,6 +26,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -60,6 +61,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -93,6 +95,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -126,6 +129,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -160,6 +164,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -193,6 +198,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -226,6 +232,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml
index efcbeeb653b..bdbc4384e1a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldNotUpdateAllSubmodules.xml
@@ -24,6 +24,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -58,6 +59,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -90,6 +92,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -122,6 +125,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -155,6 +159,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -187,6 +192,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -219,6 +225,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml
index b077221c664..e6d3c97c574 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentKeyUpdaterDaoTest/shouldUpdateKey-result.xml
@@ -26,6 +26,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -62,6 +63,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -95,6 +97,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -128,6 +131,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -162,6 +166,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -195,6 +200,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -228,6 +234,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -262,6 +269,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml
index b012cb172a0..929152c3223 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date-result.xml
@@ -25,6 +25,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml
index 2b48581c2fc..6cbd09cfcbd 100644
--- a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/update_authorization_date.xml
@@ -25,6 +25,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml
index 6cfae33701a..408e38ce69e 100644
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components-result.xml
@@ -34,6 +34,7 @@ What has been changed :
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -68,6 +69,7 @@ What has been changed :
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -102,6 +104,7 @@ What has been changed :
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components.xml
index a2b5374ea9a..692a0ca7fa4 100644
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/close_issues_clean_index_and_files_sources_of_specified_components.xml
@@ -26,6 +26,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -60,6 +61,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -94,6 +96,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
index f1999b978dd..13c18b09a5e 100644
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
@@ -32,6 +32,7 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -67,6 +68,7 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -102,6 +104,7 @@ What has been changed : purge_status=1 on snapshot 4 (PRJ) and snapshots 5 and 6
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml
index 7cd546a9111..c591f7fb5c1 100644
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles.xml
@@ -25,6 +25,7 @@
b_changed="[false]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -59,6 +60,7 @@
b_changed="[false]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -93,6 +95,7 @@
b_changed="[false]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteProject.xml
index 1f94301bbdf..2fa4250f1e9 100644
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -22,6 +22,7 @@
b_changed="[false]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -134,6 +135,7 @@
b_changed="[false]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -164,6 +166,7 @@
b_changed="[false]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
@@ -195,6 +198,7 @@
b_changed="[false]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml
index 2b94a67e6b2..ac0fd235aec 100644
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml
@@ -26,6 +26,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml
index c3b836b7593..c0a246beb1c 100644
--- a/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject.xml
@@ -26,6 +26,7 @@
b_copy_component_uuid="[null]"
b_description="[null]"
b_enabled="[false]"
+ b_uuid_path="[null]"
b_language="[null]"
b_long_name="[null]"
b_module_uuid="[null]"