Fix UserPermissionMapper on Oracle and MsSQL

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml
index 714827124a831e51ae54f7ddc8e38c4ac2a7c145..62453effbc5c13ef5794482e3123b1db4b01a122 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/permission/UserPermissionMapper.xml
@@ -18,13 +18,13 @@
 
   <select id="selectUserIdsByQuery" parameterType="map" resultType="int">
     select
-      u.id, lower(u.name) as lowerName
+      u.id, lower(u.name)
     <include refid="sqlQueryJoins" />
     <where>
       <include refid="sqlQueryFilters" />
     </where>
-    group by u.id, lowerName
-    order by case when (count(ur.role) > 0) then 1 else 2 end asc, lowerName asc
+    group by u.id, lower(u.name)
+    order by case when (count(ur.role) > 0) then 1 else 2 end asc, lower(u.name) asc
   </select>
 
   <select id="countUsersByQuery" parameterType="map" resultType="int">