aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db/src/main/resources
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2015-07-09 14:16:47 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2015-07-16 12:02:21 +0200
commitf934d2e752010579ab72be6ca61993766a2e7951 (patch)
treeb6e4a398737fe7750eb70441644bdfba25a57327 /sonar-db/src/main/resources
parentcbc7832b745ae07fee7a1f6200eb9aa8aa0a7c75 (diff)
downloadsonarqube-f934d2e752010579ab72be6ca61993766a2e7951.tar.gz
sonarqube-f934d2e752010579ab72be6ca61993766a2e7951.zip
SONAR-6702 Reactivate previously removed components
Diffstat (limited to 'sonar-db/src/main/resources')
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml7
1 files changed, 4 insertions, 3 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 19740c7f76e..6dfe75658ea 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
@@ -139,8 +139,7 @@
</select>
<sql id="modulesTreeQuery">
- INNER JOIN projects module ON module.project_uuid = p.project_uuid AND module.uuid = #{moduleUuid} AND
- module.scope='PRJ' AND module.enabled = ${_true}
+ INNER JOIN projects module ON module.project_uuid = p.project_uuid AND module.uuid = #{moduleUuid} AND module.scope='PRJ' AND module.enabled = ${_true}
<where>
<if test="excludeDisabled">
p.enabled = ${_true}
@@ -215,7 +214,9 @@
FROM projects p
INNER JOIN projects root ON root.uuid=p.project_uuid AND root.kee=#{projectKey}
<where>
- AND p.enabled=${_true}
+ <if test="excludeDisabled">
+ p.enabled = ${_true}
+ </if>
<if test="scope != null">
AND p.scope=#{scope}
</if>