provisioned and ghosts projects case insensitive when searching for a pattern - SONAR...

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsProvisionedActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsProvisionedActionTest.java
index 927c4e4128f5552e163fc52a6ea7e9fe0b2158e9..c6575fef314bb9ea638a90ae46702f649879781f 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsProvisionedActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsProvisionedActionTest.java
@@ -129,7 +129,7 @@ public class ProjectsProvisionedActionTest {
     dbSession.commit();
 
     String jsonOutput = ws.newGetRequest("api/projects", "provisioned")
-      .setParam(Param.TEXT_QUERY, "provisioned-name-2")
+      .setParam(Param.TEXT_QUERY, "PROVISIONED-name-2")
       .execute().outputAsString();
 
     assertThat(jsonOutput)

diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml b/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml
index 92d5d1180dcc6faab9dcee01f453f7ec4ffeae96..8c5c6abcbd7504eaa4f468960bb06ac45738df4b 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentMapper.xml
@@ -246,12 +246,10 @@
     and p.enabled=${_true}
     and p.qualifier=#{qualifier}
     and p.copy_resource_id is null
-    <if test="query!=null">
       and (
       UPPER(p.name) like #{query}
       or UPPER(p.kee) like #{query}
       )
-    </if>
   </sql>
 
   <select id="selectGhostProjects" parameterType="map" resultType="Component">
@@ -273,11 +271,9 @@
       s2.id is null
       and p.qualifier=#{qualifier}
       and p.copy_resource_id is null
-      <if test="query!=null">
         and (
         UPPER(p.name) like #{query}
         or UPPER(p.kee) like #{query}
         )
-      </if>
   </sql>
 </mapper>