diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-01-12 11:36:06 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-01-16 11:38:43 +0100 |
| commit | f3f4825a1d43a3ba80204c68edf1e189a7b2e385 (patch) | |
| tree | 34806a6c71cd547d9d1736a1555bbcfe2ae1e03d /sonar-db | |
| parent | 464573f60370e1bb3cbddc3ebb73417019c71fa2 (diff) | |
| download | sonarqube-f3f4825a1d43a3ba80204c68edf1e189a7b2e385.tar.gz sonarqube-f3f4825a1d43a3ba80204c68edf1e189a7b2e385.zip | |
SONAR-8595 make ComponentMapper.selectByQuery return org key
Diffstat (limited to 'sonar-db')
| -rw-r--r-- | sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml | 10 | ||||
| -rw-r--r-- | sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml index 2d9c0ddab68..bb0d24b393e 100644 --- a/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml @@ -275,7 +275,8 @@ <select id="selectByQuery" resultType="Component"> select - <include refid="componentColumns"/> + <include refid="componentColumns"/>, + o.kee as organizationKey <include refid="sqlSelectByQuery"/> ORDER BY LOWER(p.name), p.name, p.id </select> @@ -287,8 +288,10 @@ <sql id="sqlSelectByQuery"> from projects p - <where> - AND p.enabled=${_true} + inner join organizations o on + o.uuid = p.organization_uuid + where + p.enabled=${_true} AND p.copy_component_uuid is null <if test="query.qualifiers!=null"> AND p.qualifier in @@ -322,7 +325,6 @@ ) ) </if> - </where> </sql> <!-- "p" is ancestors --> diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java index 2038172b9c2..a82695097b4 100644 --- a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java @@ -782,7 +782,9 @@ public class ComponentDaoTest { assertThat(result).hasSize(3); assertThat(count).isEqualTo(9); - assertThat(result).extracting("name").containsExactly("project-2", "project-3", "project-4"); + assertThat(result).extracting(ComponentDto::name).containsExactly("project-2", "project-3", "project-4"); + assertThat(result).extracting(ComponentDto::getOrganizationUuid).containsOnly(organizationDto.getUuid()); + assertThat(result).extracting(ComponentDto::getOrganizationKey).containsOnly(organizationDto.getKey()); } @Test |