From 1b12a6829dc81c1cfa2a59c3e1d644c3cc9c90ab Mon Sep 17 00:00:00 2001
From: Benjamin Campomenosi <benjamin.campomenosi@sonarsource.com>
Date: Tue, 11 Apr 2023 12:10:35 +0200
Subject: [PATCH] SONAR-18860 fix condition in query for
 ComponentMapper#selectByKeysAndBranchOrPr

---
 .../main/resources/org/sonar/db/component/ComponentMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 12e5de7b724..70ad9b92fdf 100644
--- 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>
-- 
2.39.5