From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Wed, 13 May 2015 13:29:15 +0000 (+0200)
Subject: provisioned and ghosts projects case insensitive when searching for a pattern - SONAR... 
X-Git-Tag: 5.2-RC1~1943
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a447948f9cebdac8edbcc904d02af362a2869ff8;p=sonarqube.git

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

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 927c4e4128f..c6575fef314 100644
--- 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 92d5d1180dc..8c5c6abcbd7 100644
--- 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>