diff options
author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-02-14 16:36:24 +0100 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-02-14 16:37:00 +0100 |
commit | 536562976dad7425fcb546736eaa6e463c8032a9 (patch) | |
tree | 28f2f72eeb12e6f2875b3ff16f08e396ca9481b5 /sonar-core | |
parent | 7cbe24d9765f4d212fd651bdbf864ac52d218938 (diff) | |
download | sonarqube-536562976dad7425fcb546736eaa6e463c8032a9.tar.gz sonarqube-536562976dad7425fcb546736eaa6e463c8032a9.zip |
SONAR-3208 complete database tables
* add PROJECTS.PERSON_ID
* create the table AUTHORS
Diffstat (limited to 'sonar-core')
20 files changed, 56 insertions, 44 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java index 814c1ee26e2..781f8691f84 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java @@ -46,6 +46,7 @@ public final class DatabaseUtils { "active_rule_parameters", "active_rule_param_changes", "alerts", + "authors", "characteristics", "characteristic_edges", "characteristic_properties", diff --git a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java index 1d01411d815..610d9586c5a 100644 --- a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java +++ b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java @@ -34,7 +34,7 @@ public class SchemaMigration { public final static int VERSION_UNKNOWN = -1; - public static final int LAST_VERSION = 260; + public static final int LAST_VERSION = 262; public static final int VERSION_2_13 = 241; public final static String TABLE_NAME = "schema_migrations"; diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql index 59c4d9f02cd..1038bf1ddc2 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql @@ -177,6 +177,9 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('256'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('257'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('258'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('259'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('260'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('261'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('262'); INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null); ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2; diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl index 2de07173e61..e301e098883 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl @@ -295,7 +295,8 @@ CREATE TABLE "PROJECTS" ( "PROFILE_ID" INTEGER, "LANGUAGE" VARCHAR(5), "COPY_RESOURCE_ID" INTEGER, - "LONG_NAME" VARCHAR(256) + "LONG_NAME" VARCHAR(256), + "PERSON_ID" INTEGER ); CREATE TABLE "REVIEWS" ( @@ -507,6 +508,13 @@ CREATE TABLE "RULE_NOTES" ( "UPDATED_AT" TIMESTAMP ); +CREATE TABLE "AUTHORS" ( + "PERSON_ID" INTEGER, + "COMMITTER" VARCHAR(100), + "CREATED_AT" TIMESTAMP, + "UPDATED_AT" TIMESTAMP +); + -- ---------------------------------------------- -- DDL Statements for indexes diff --git a/sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java b/sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java index 2c9dd6299a8..37bdba4d99a 100644 --- a/sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/purge/PurgeDaoTest.java @@ -120,21 +120,21 @@ public class PurgeDaoTest extends DaoTestCase { @Test public void shouldPurgeProject() { setupData("shouldPurgeProject"); - dao.purgeProject(1, new String[0]); + dao.purge(1, new String[0]); checkTables("shouldPurgeProject", "projects", "snapshots"); } @Test public void shouldPurgeDirectoriesAndFiles() { setupData("shouldPurgeDirectoriesAndFiles"); - dao.purgeProject(1, new String[]{Scopes.DIRECTORY, Scopes.FILE}); + dao.purge(1, new String[]{Scopes.DIRECTORY, Scopes.FILE}); checkTables("shouldPurgeDirectoriesAndFiles", "projects", "snapshots"); } @Test public void shouldDisableResourcesWithoutLastSnapshot() { setupData("shouldDisableResourcesWithoutLastSnapshot"); - dao.purgeProject(1, new String[0]); + dao.purge(1, new String[0]); checkTables("shouldDisableResourcesWithoutLastSnapshot", "projects", "snapshots"); } diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml index 1d434ed08c6..e5e94801418 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml @@ -3,7 +3,7 @@ <!-- root --> <projects id="1" enabled="[true]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="[false]" purge_status="[null]" @@ -33,7 +33,7 @@ <!-- modules --> <projects id="2" enabled="[true]" root_id="1" long_name="[null]" scope="PRJ" qualifier="BRC" kee="module1" name="module1" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" status="P" islast="[false]" purge_status="[null]" @@ -49,7 +49,7 @@ <projects id="3" enabled="[false]" root_id="1" long_name="[null]" scope="PRJ" qualifier="BRC" kee="module2" name="module2" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <snapshots id="3" project_id="3" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" status="P" islast="[true]" purge_status="[null]" @@ -65,7 +65,7 @@ <!-- file of module 2--> <projects id="4" enabled="[false]" root_id="3" long_name="[null]" scope="FIL" qualifier="FIL" kee="module2:File.java" name="File" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1" status="P" islast="[true]" purge_status="[null]" diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteResource.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteResource.xml index 7230006191a..1f37f22fa84 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteResource.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteResource.xml @@ -2,7 +2,7 @@ <projects id="1" enabled="[true]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="[false]" purge_status="[null]" diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml index 84a427552e3..732f1a1d776 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot-result.xml @@ -10,17 +10,17 @@ What has been changed : <!-- the project --> <projects id="1" enabled="[false]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the directory --> <projects id="2" enabled="[false]" root_id="1" long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the file --> <projects id="3" enabled="[false]" root_id="1" long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml index 827bb856789..16df8f3489e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDisableResourcesWithoutLastSnapshot.xml @@ -3,17 +3,17 @@ <!-- the project --> <projects id="1" enabled="[true]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the directory --> <projects id="2" enabled="[true]" root_id="1" long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the file --> <projects id="3" enabled="[true]" root_id="1" long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles-result.xml index a0020290680..a50174fdd99 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles-result.xml @@ -9,17 +9,17 @@ What has been changed : purge_status=1 on snapshots 4, 5 and 6 <!-- the project --> <projects id="1" enabled="[true]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the directory --> <projects id="2" enabled="[true]" root_id="1" long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the file --> <projects id="3" enabled="[true]" root_id="1" long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- do not purge last snapshots --> <snapshots id="1" diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles.xml index d299f79946b..955b522db3f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeDirectoriesAndFiles.xml @@ -3,17 +3,17 @@ <!-- the project --> <projects id="1" enabled="[true]" root_id="[null]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the directory --> <projects id="2" enabled="[true]" root_id="1" long_name="[null]" scope="DIR" qualifier="DIR" kee="project:my/dir" name="my/dir" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- the file --> <projects id="3" enabled="[true]" root_id="1" long_name="[null]" scope="FIL" qualifier="FIL" kee="project:my/dir/File.java" name="my/dir/File.java" - description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- do not purge last snapshots --> <snapshots id="1" diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml index 48436ab0815..4890f79c519 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject-result.xml @@ -3,7 +3,7 @@ <!-- the project --> <projects id="1" enabled="[true]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- snapshot already purged --> diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml index 55682016a04..3ad298bd6b9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml +++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldPurgeProject.xml @@ -3,7 +3,7 @@ <!-- the project --> <projects id="1" enabled="[true]" long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project" - root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" profile_id="[null]"/> + root_id="[null]" description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" profile_id="[null]"/> <!-- snapshot already purged --> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml index 41ab615c627..a993fe82a6f 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceDaoTest/fixture.xml @@ -3,7 +3,7 @@ <!-- root project --> <projects id="1" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" description="[null]" long_name="Struts" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" status="P" islast="[false]" purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" @@ -17,7 +17,7 @@ <!-- project --> <projects id="2" root_id="1" kee="org.struts:struts-core" name="Struts Core" scope="PRJ" qualifier="BRC" long_name="Struts Core" - description="[null]" enabled="[true]" language="java" copy_resource_id="[null]"/> + description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" status="P" islast="[false]" purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" @@ -32,7 +32,7 @@ <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts:org.struts" name="org.struts" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots id="3" project_id="3" parent_snapshot_id="2" root_project_id="1" root_snapshot_id="1" status="P" islast="[false]" purge_status="[null]" period1_mode="[null]" period1_param="[null]" period1_date="[null]" @@ -47,7 +47,7 @@ <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext" name="RequestContext" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots id="4" project_id="4" parent_snapshot_id="3" root_project_id="1" root_snapshot_id="1" status="P" islast="[false]" purge_status="[null]" diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml index 2e1e9bb9678..7210c845707 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml @@ -4,24 +4,24 @@ <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" root_id="[null]" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <projects long_name="[null]" id="2" scope="PRJ" qualifier="BRC" kee="org.struts:struts-core" name="Struts Core" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- note that the root_id of package/file is wrong. It references the module but not the root project --> <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:org.struts" name="org.struts" root_id="2" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <projects long_name="org.struts.RequestContext" id="4" scope="CLA" qualifier="CLA" kee="org.struts:struts-core:org.struts.RequestContext" name="RequestContext" root_id="2" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1"/> <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml index 33fcdb11728..820d4a95e59 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml @@ -4,24 +4,24 @@ <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" root_id="[null]" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <projects long_name="[null]" id="2" scope="PRJ" qualifier="BRC" kee="org.struts:struts-core" name="Struts Core" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- note that the root_id of package/file is wrong. It references the module but not the root project --> <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:org.struts" name="org.struts" root_id="2" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA" kee="org.struts:struts-core:org.struts.RequestContext" name="RequestContext" root_id="2" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1"/> <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml index 2aca7a20445..c7484ec4a2a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml @@ -4,20 +4,20 @@ <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" root_id="[null]" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- directory --> <projects long_name="org.struts" id="2" scope="DIR" qualifier="PAC" kee="org.struts:struts:org.struts" name="org.struts" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- file --> <projects long_name="org.struts.RequestContext" id="3" scope="CLA" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext" name="RequestContext" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" qualifier="PAC"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml index 87e14d537a7..5388b78865a 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml @@ -4,19 +4,19 @@ <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" root_id="[null]" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- directory --> <projects long_name="org.struts" id="2" scope="DIR" qualifier="PAC" kee="org.struts:struts:org.struts" name="org.struts" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <!-- file --> <projects long_name="org.struts.RequestContext" id="3" scope="FIL" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext" name="RequestContext" root_id="1" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK" /> <snapshots purge_status="[null]" id="2" islast="[true]" root_project_id="1" project_id="2" scope="DIR" qualifier="PAC"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml index 30cf6f02ba7..4909ab38144 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml @@ -3,7 +3,7 @@ <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Apache Struts" root_id="[null]" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml index dfce65c8413..fae54763976 100644 --- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml +++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml @@ -3,7 +3,7 @@ <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Apache Struts" root_id="[null]" description="[null]" - enabled="[true]" language="java" copy_resource_id="[null]"/> + enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/> <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/> |