2 files changed, 16 insertions, 3 deletions
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml
index a31b00273c5..a85abad3bbe 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueFilterMapper.xml
@@ -52,12 +52,25 @@
     </where>
   </select>
 
-  <select id="selectSharedForUser" parameterType="String" resultType="IssueFilter">
+  <select id="selectSharedWithoutUserFilters" parameterType="String" resultType="IssueFilter">
     select <include refid="issueFilterColumns"/>
     from issue_filters filters
     <where>
       filters.shared=${_true}
-      and filters.user_login&lt;&gt;#{user}
+      and filters.user_login&lt;&gt;#{userLogin}
+    </where>
+  </select>
+
+  <select id="selectSharedWithoutUserFiltersByName" parameterType="String" resultType="IssueFilter">
+    select <include refid="issueFilterColumns"/>
+    from issue_filters filters
+    <where>
+      filters.shared=${_true}
+      and filters.user_login&lt;&gt;#{userLogin}
+      and filters.name=#{name}
+      <if test="existingId != null">
+        and filters.id&lt;&gt;#{existingId}
+      </if>
     </where>
   </select>
 
diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
index 06fa350595e..a6b5c76457f 100644
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml
@@ -217,7 +217,7 @@
 
   <!-- Oracle -->
   <select id="selectIssues" parameterType="map" resultType="Issue" fetchSize="100000" databaseId="oracle">
-    select * from (select i.id
+    select id from (select i.id
     <include refid="sortColumn"/>
     <include refid="selectQueryConditions"/>
     ) where rownum &lt;= #{maxResults}