SONAR-7135 WS api/measures/component_tree search query must match exactly the compone...

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 6d92ed2c93267317aaf1494f0c6eb2b694904e6f..32087814dbd2ba74fe860b668f7422fc3897700b 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/component/ComponentMapper.xml
@@ -287,17 +287,18 @@
         AND p.language = #{query.language}
       </if>
       <if test="query.nameOrKeyQuery!=null">
-        AND (exists (
-        select 1
-        from resource_index ri
-        where
-        ri.resource_id=p.id
-        AND ri.qualifier in
-        <foreach collection="query.qualifiers" item="qualifier" open="(" close=")" separator=",">
-          #{qualifier}
-        </foreach>
-        AND ri.kee like #{query.nameOrKeyQueryToSqlForResourceIndex} ESCAPE '/')
-        OR p.kee like #{query.nameOrKeyQueryToSqlForProjectKey} ESCAPE '/')
+        AND (
+          exists (
+            select 1
+            from resource_index ri
+            where
+            ri.resource_id=p.id
+            AND ri.qualifier in
+            <foreach collection="query.qualifiers" item="qualifier" open="(" close=")" separator=",">
+              #{qualifier}
+            </foreach>
+            AND ri.kee like #{query.nameOrKeyQueryToSqlForResourceIndex} ESCAPE '/')
+          OR p.kee = #{query.nameOrKeyQuery})
       </if>
     </where>
   </sql>
@@ -351,13 +352,14 @@
       </foreach>
     </if>
     <if test="query.nameOrKeyQuery!=null">
-      AND (exists (
-      select 1
-      from resource_index ri
-      where
-      (ri.resource_id=p.id OR ri.resource_id=p.copy_resource_id)
-      AND ri.kee like #{query.nameOrKeyQueryToSqlForResourceIndex} ESCAPE '/')
-      OR p.kee like #{query.nameOrKeyQueryToSqlForProjectKey} ESCAPE '/')
+      AND (
+        exists (
+          select 1
+          from resource_index ri
+          where
+          (ri.resource_id=p.id OR ri.resource_id=p.copy_resource_id)
+            AND ri.kee like #{query.nameOrKeyQueryToSqlForResourceIndex} ESCAPE '/')
+        OR p.kee = #{query.nameOrKeyQuery})
     </if>
   </sql>
 

diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
index 9a8e159e4bde2f8ee433b508c12dc130b0eca4e8..e739cba9096cb70d47819c9f78ad9251492b6119 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
@@ -712,7 +712,7 @@ public class ComponentDaoTest {
     db.commit();
     componentDb.indexProjects();
 
-    ComponentQuery query = ComponentQuery.builder().setNameOrKeyQuery("project-_%-").setQualifiers(Qualifiers.PROJECT).build();
+    ComponentQuery query = ComponentQuery.builder().setNameOrKeyQuery("project-_%-key").setQualifiers(Qualifiers.PROJECT).build();
     List<ComponentDto> result = underTest.selectByQuery(dbSession, query, 0, 10);
 
     assertThat(result).hasSize(1);
@@ -782,7 +782,7 @@ public class ComponentDaoTest {
     componentDb.indexProjects();
 
     ComponentTreeQuery query = newTreeQuery(projectSnapshot)
-      .setNameOrKeyQuery("file-key").build();
+      .setNameOrKeyQuery("file-key-1").build();
 
     List<ComponentDtoWithSnapshotId> result = underTest.selectDirectChildren(dbSession, query);
     int count = underTest.countDirectChildren(dbSession, query);