SONAR-18860 fix condition in query for ComponentMapper#selectByKeysAndBranchOrPr

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
index 12e5de7b724f710b614548eb9b7c81f759fbd0b3..70ad9b92fdf14bdf833917d13ed9f3eb10e6640e 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
@@ -126,7 +126,7 @@
         AND pb.branch_type = 'PULL_REQUEST'
       </when>
       <otherwise>
-        AND (pb.uuid is null or pb.is_main = ${_true})
+        AND (pb.is_main = ${_true} OR p.qualifier IN ('VW', 'SVW') OR (p.qualifier = 'TRK' AND p.scope = 'FIL'))
       </otherwise>
     </choose>
   </select>