Fix SQL for Oracle

diff --git a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml
index 10f52f8d5e079ffa42e3eeb852b2f63b432b4f1c..7d7e9b075f77d1c0ca7976cacbe205621b02014a 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml
@@ -89,25 +89,25 @@
     FROM group_roles WHERE resource_id=#{id}
   </select>
 
-  <select id="countUserWithPermission" parameterType="map" resultType="Integer">
+  <select id="countUserWithPermission" parameterType="map" resultType="int">
     SELECT COUNT(DISTINCT tmp.id)
     FROM (
     SELECT u.id as id
-    FROM users AS u
-    INNER JOIN user_roles AS ur ON ur.user_id = u.id
+    FROM users u
+    INNER JOIN user_roles ur ON ur.user_id = u.id
     <where>
-      AND (ur.role = #{permission} AND ur.resource_id IS NULL)
-      AND u.active = ${_true}
+      AND (ur.role=#{permission} AND ur.resource_id IS NULL)
+      AND u.active=${_true}
     </where>
     UNION
     select u.id as id
-    FROM users as u
-    INNER JOIN groups_users AS gu ON gu.user_id = u.id
-    INNER JOIN group_roles AS gr ON gr.group_id = gu.group_id
-    INNER JOIN groups AS g ON g.id = gu.group_id
+    FROM users u
+    INNER JOIN groups_users gu ON gu.user_id = u.id
+    INNER JOIN group_roles gr ON gr.group_id = gu.group_id
+    INNER JOIN groups g ON g.id = gu.group_id
     <where>
-      AND (gr.role = #{permission} AND gr.resource_id IS NULL)
-      AND u.active = ${_true}
+      AND (gr.role=#{permission} AND gr.resource_id IS NULL)
+      AND u.active=${_true}
     </where>
     ) AS tmp
   </select>