aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db/src/main
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-10-27 17:38:00 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2016-10-28 14:53:22 +0200
commitf0e3b2f62a070961ba3fa053d42f006a8f8e1571 (patch)
tree30b5ce171d501e544e595bafba02695555384494 /sonar-db/src/main
parentaeb728e615ba8cd6890be294028dfae22552df0f (diff)
downloadsonarqube-f0e3b2f62a070961ba3fa053d42f006a8f8e1571.tar.gz
sonarqube-f0e3b2f62a070961ba3fa053d42f006a8f8e1571.zip
SONAR-8089 SONAR-8325 Add missing join on projects in MeasureMapper#selectByQuery
Diffstat (limited to 'sonar-db/src/main')
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml
index 9ddc76522fd..ab9bbcc31c5 100644
--- a/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml
@@ -30,7 +30,8 @@
<include refid="measureColumns"/>
from
project_measures pm
- inner join snapshots analysis on analysis.uuid = pm.analysis_uuid
+ inner join projects p on p.uuid=pm.component_uuid
+ inner join snapshots analysis on analysis.component_uuid = p.project_uuid and analysis.uuid = pm.analysis_uuid
<if test="query.getMetricKeys() != null">
inner join metrics m on m.id = pm.metric_id
</if>
@@ -41,7 +42,7 @@
<if test="query.getAnalysisUuid() != null">
analysis.uuid = #{query.analysisUuid}
</if>
- and pm.component_uuid in
+ and p.uuid in
<foreach item="componentUuid" collection="query.getComponentUuids()" open="(" separator="," close=")">
#{componentUuid}
</foreach>