From 81e740e5c64d75b93e63ab428420cc3f12ee15a5 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 28 Sep 2016 16:25:55 +0200
Subject: [PATCH] Remove useless <where> in mybatis

---
 .../db/permission/GroupPermissionMapper.xml   | 23 +++----
 .../sonar/db/permission/PermissionMapper.xml  | 60 ++++++-------------
 2 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/sonar-db/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml b/sonar-db/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml
index dd23e726266..31e08d7235c 100644
--- a/sonar-db/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/permission/GroupPermissionMapper.xml
@@ -14,16 +14,13 @@
     -- Add Anyone group permission
     SELECT #{anyoneGroup} as name, group_role.role as permission, group_role.resource_id as componentId
     FROM group_roles group_role
-    <where>
-      AND group_role.group_id IS NULL
-    </where>
+    where group_role.group_id IS NULL
     ) groups
-    <where>
+    where
       groups.componentId in
       <foreach collection="componentIds" open="(" close=")" item="id" separator=",">
         #{id}
       </foreach>
-    </where>
     GROUP BY groups.permission, groups.componentId
   </select>
 
@@ -44,8 +41,8 @@
     -- Add Anyone group permission
     SELECT #{anyoneGroup} as name
     FROM group_roles group_role
-    <where>
-      AND group_role.role=#{permission}
+    where
+      group_role.role=#{permission}
       AND group_role.group_id IS NULL
       <if test="componentId != null">
         AND group_role.resource_id=#{componentId}
@@ -53,7 +50,6 @@
       <if test="componentId == null">
         AND group_role.resource_id IS NULL
       </if>
-    </where>
     ) groups
   </select>
 
@@ -78,11 +74,9 @@
     UNION ALL
     select 0 as group_id, 'Anyone' as name, gr.role as permission, gr.resource_id as resource_id, gr.id as id
     from group_roles gr
-    <where>
-      <if test="query.withAtLeastOnePermission()">
-        and gr.group_id is null
-      </if>
-    </where>
+    <if test="query.withAtLeastOnePermission()">
+      where gr.group_id is null
+    </if>
     ) gr
     left join projects p on gr.resource_id = p.id
     <where>
@@ -117,7 +111,7 @@
       FROM group_roles gr
       WHERE gr.group_id is null
       ) sub
-    <where>
+    where
       sub.name IN
       <foreach collection="groupNames" open="(" close=")" item="name" separator=",">
         #{name}
@@ -128,7 +122,6 @@
       <if test="projectId==null">
         AND sub.resourceId IS NULL
       </if>
-    </where>
   </select>
 
 </mapper>
diff --git a/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml
index 3df936ace02..d02f2b152b7 100644
--- a/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/permission/PermissionMapper.xml
@@ -47,28 +47,25 @@
         SELECT p.kee as root_project_kee
         FROM group_roles gr
         INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL
-        <where>
-          and gr.role=#{role}
+        where
+          gr.role=#{role}
           and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where
           gu.user_id=#{userId}))
-        </where>
         UNION
         SELECT p.kee as root_project_kee
         FROM user_roles ur
         INNER JOIN projects p on p.id = ur.resource_id AND p.module_uuid IS NULL
-        <where>
-          and ur.role=#{role}
+        where
+          ur.role=#{role}
           and ur.user_id = #{userId}
-        </where>
       </when>
       <otherwise>
         SELECT p.kee as root_project_kee
         FROM group_roles gr
         INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL
-        <where>
-          and gr.role=#{role}
+        where
+          gr.role=#{role}
           and gr.group_id is null
-        </where>
       </otherwise>
     </choose>
   </sql>
@@ -79,28 +76,25 @@
         SELECT p.uuid as root_project_uuid
         FROM group_roles gr
         INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL
-        <where>
-          and gr.role=#{role}
+        where
+          gr.role=#{role}
           and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where
           gu.user_id=#{userId}))
-        </where>
         UNION
         SELECT p.uuid as root_project_uuid
         FROM user_roles ur
         INNER JOIN projects p on p.id = ur.resource_id AND p.module_uuid IS NULL
-        <where>
-          and ur.role=#{role}
+        where
+          ur.role=#{role}
           and ur.user_id = #{userId}
-        </where>
       </when>
       <otherwise>
         SELECT p.uuid as root_project_uuid
         FROM group_roles gr
         INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL
-        <where>
-          and gr.role=#{role}
+        where
+          gr.role=#{role}
           and gr.group_id is null
-        </where>
       </otherwise>
     </choose>
   </select>
@@ -112,28 +106,21 @@
         SELECT p.id as root_project_id
         FROM group_roles gr
         INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL
-        <where>
-          and gr.role=#{role}
+        where
+          gr.role=#{role}
           and (gr.group_id is null or gr.group_id in (select gu.group_id from groups_users gu where
           gu.user_id=#{userId}))
-        </where>
         UNION
         SELECT p.id as root_project_id
         FROM user_roles ur
         INNER JOIN projects p on p.id = ur.resource_id AND p.module_uuid IS NULL
-        <where>
-          and ur.role=#{role}
-          and ur.user_id = #{userId}
-        </where>
+        where ur.role=#{role} and ur.user_id = #{userId}
       </when>
       <otherwise>
         SELECT p.id as root_project_id
         FROM group_roles gr
         INNER JOIN projects p on p.id = gr.resource_id AND p.module_uuid IS NULL
-        <where>
-          and gr.role=#{role}
-          and gr.group_id is null
-        </where>
+        where gr.role=#{role} and gr.group_id is null
       </otherwise>
     </choose>
   </sql>
@@ -145,10 +132,7 @@
         FROM group_roles gr
         INNER JOIN groups_users gu on gu.group_id=gr.group_id
         INNER JOIN users u on u.id=gu.user_id
-        <where>
-          and u.login=#{userLogin}
-          and gr.resource_id is null
-        </where>
+        where u.login=#{userLogin} and gr.resource_id is null
         UNION
         SELECT gr.role
         FROM group_roles gr
@@ -157,18 +141,12 @@
         SELECT ur.role
         FROM user_roles ur
         INNER JOIN users u on u.id=ur.user_id
-        <where>
-          and u.login=#{userLogin}
-          and ur.resource_id is null
-        </where>
+        where u.login=#{userLogin} and ur.resource_id is null
       </when>
       <otherwise>
         SELECT gr.role
         FROM group_roles gr
-        <where>
-          and gr.resource_id is null
-          and gr.group_id is null
-        </where>
+        where gr.resource_id is null and gr.group_id is null
       </otherwise>
     </choose>
   </select>
-- 
2.39.5