aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-06-28 09:35:02 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-06-28 09:35:02 +0200
commit983b3c4a62c4541bbc0bab5d96c43f55efa52100 (patch)
treef8bf3facb4cc1aed3ee0c95e9fc99c89965944f1 /sonar-db
parenta278aa4f3a41b976a5d88c48f035677151c5b454 (diff)
downloadsonarqube-983b3c4a62c4541bbc0bab5d96c43f55efa52100.tar.gz
sonarqube-983b3c4a62c4541bbc0bab5d96c43f55efa52100.zip
Fix SQL request for MSSQL and Postgres
Diffstat (limited to 'sonar-db')
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml15
1 files changed, 5 insertions, 10 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 49646233f04..31b71fecbab 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
@@ -322,10 +322,9 @@
select
<include refid="componentColumns"/>
from projects base
- inner join projects p
+ inner join projects p on p.project_uuid = base.project_uuid
where
base.uuid = #{query.baseUuid}
- and p.project_uuid = base.project_uuid
and base.uuid_path like #{baseUuidPathLike}
and p.uuid != base.uuid
and p.enabled = ${_true}
@@ -347,12 +346,10 @@
<sql id="sqlChildren">
from projects p
- inner join projects base
- inner join snapshots s
+ inner join projects base on base.project_uuid = p.project_uuid
+ inner join snapshots s on s.component_uuid = base.project_uuid
where
base.uuid = #{query.baseUuid}
- and base.project_uuid = p.project_uuid
- and s.component_uuid = base.project_uuid
and p.enabled = ${_true}
and s.islast = ${_true}
and p.uuid_path = #{baseUuidPath}
@@ -400,14 +397,12 @@
<sql id="sqlDescendants">
from projects p
- inner join projects base
- inner join snapshots s
+ inner join projects base on base.project_uuid=p.project_uuid
+ inner join snapshots s on s.component_uuid = base.project_uuid
where
base.uuid = #{query.baseUuid}
- and base.project_uuid=p.project_uuid
and p.enabled = ${_true}
and p.uuid_path like #{baseUuidPathLike} ESCAPE '/'
- and s.component_uuid = base.project_uuid
and s.islast = ${_true}
<include refid="sqlTreeFilters"/>
</sql>