aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-11-03 16:11:34 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2016-11-03 16:24:42 +0100
commitf0774ea5179b30cb9cae1a3ce9e9c72eb7154156 (patch)
treeed914280c5b62385dcd4b3f888e19941533772fb
parentaa8a221bcb49ebe482dac62456bc0df2e03b5971 (diff)
downloadsonarqube-f0774ea5179b30cb9cae1a3ce9e9c72eb7154156.tar.gz
sonarqube-f0774ea5179b30cb9cae1a3ce9e9c72eb7154156.zip
SONAR-8325 Fix bad imports in MeasureMapper#selectByQuery
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/measure/MeasureMapper.xml14
1 files changed, 7 insertions, 7 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 929ad1c4412..3b12f1552c2 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
@@ -39,25 +39,25 @@
<select id="selectByQueryOnComponents" parameterType="map" resultType="Measure">
select <include refid="measureColumns"/> from project_measures pm
+ <include refid="selectByQueryCommonJoin"/>
inner join projects p on p.project_uuid=analysis.component_uuid and p.uuid=pm.component_uuid
and p.project_uuid=#{query.projectUuid}
- and p.uuid in
- <foreach item="componentUuid" collection="query.getComponentUuids()" open="(" separator="," close=")">
- #{componentUuid}
- </foreach>
- <include refid="selectByQueryCommonJoin"/>
where
<include refid="selectByQueryCommonFilters"/>
+ and pm.component_uuid in
+ <foreach item="componentUuid" collection="query.getComponentUuids()" open="(" separator="," close=")">
+ #{componentUuid}
+ </foreach>
</select>
<select id="selectByQueryOnSingleComponent" parameterType="map" resultType="Measure">
select <include refid="measureColumns"/> from project_measures pm
+ <include refid="selectByQueryCommonJoin"/>
inner join projects p on p.project_uuid=analysis.component_uuid
and p.uuid=pm.component_uuid
- and p.uuid=#{query.componentUuid}
- <include refid="selectByQueryCommonJoin"/>
where
<include refid="selectByQueryCommonFilters"/>
+ and pm.component_uuid=#{query.componentUuid}
</select>
<sql id="selectByQueryCommonJoin">