diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-01-12 10:51:45 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-01-16 11:38:43 +0100 |
| commit | 464573f60370e1bb3cbddc3ebb73417019c71fa2 (patch) | |
| tree | 3704c034b6da76f9dfa9d979811158b90a0bdc8d /sonar-db | |
| parent | fced51cbc6ff1eba5282029373a839d9d84d2d06 (diff) | |
| download | sonarqube-464573f60370e1bb3cbddc3ebb73417019c71fa2.tar.gz sonarqube-464573f60370e1bb3cbddc3ebb73417019c71fa2.zip | |
SONAR-8595 make ComponentMapper.selectDescendants return org key
Diffstat (limited to 'sonar-db')
| -rw-r--r-- | sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml | 5 | ||||
| -rw-r--r-- | sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java | 2 |
2 files changed, 6 insertions, 1 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 977a24d52e3..2d9c0ddab68 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 @@ -341,8 +341,11 @@ <select id="selectDescendants" resultType="Component"> select - <include refid="componentColumns"/> + <include refid="componentColumns"/>, + o.kee as organizationKey from projects p + inner join organizations o on + o.uuid = p.organization_uuid <include refid="selectDescendantsJoins"/> <where> <include refid="selectDescendantsFilters"/> 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 4358ab3cc80..2038172b9c2 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 @@ -997,6 +997,8 @@ public class ComponentDaoTest { List<ComponentDto> components = underTest.selectDescendants(dbSession, dbQuery); assertThat(components).extracting("uuid").containsOnly("project-copy-uuid", "subview-uuid"); + assertThat(components).extracting("organizationUuid").containsOnly(organizationDto.getUuid()); + assertThat(components).extracting("organizationKey").containsOnly(organizationDto.getKey()); } private static ComponentTreeQuery.Builder newTreeQuery(String baseUuid) { |