Remove fetchSize in issues SQL and reactivate previously deactivated unit test

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 2cb15386ef9afd60fccf2caa73ac493f5deb0965..9304f859bfb906b552e47ecd71d0803898e4a123 100644 (file)
--- 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
@@ -185,7 +185,7 @@
     </where>
   </select>
 
-  <select id="selectIssues" parameterType="map" resultType="Issue" fetchSize="100000">
+  <select id="selectIssues" parameterType="map" resultType="Issue">
     select <include refid="issueColumns"/>
     from issues i
     inner join rules r on r.id=i.rule_id
@@ -194,7 +194,7 @@
     <include refid="selectQueryConditions"/>
   </select>
 
-  <select id="selectIssueIds" parameterType="map" resultType="Issue" fetchSize="100000">
+  <select id="selectIssueIds" parameterType="map" resultType="Issue">
     select i.id <include refid="sortColumn"/>
     from issues i
     <include refid="selectQueryConditions"/>
@@ -202,14 +202,14 @@
   </select>
 
   <!-- SQL Server -->
-  <select id="selectIssueIds" parameterType="map" resultType="Issue" fetchSize="100000" databaseId="mssql">
+  <select id="selectIssueIds" parameterType="map" resultType="Issue" databaseId="mssql">
     select top (#{maxResults}) i.id <include refid="sortColumn"/>
     from issues i
     <include refid="selectQueryConditions"/>
   </select>
 
   <!-- Oracle -->
-  <select id="selectIssueIds" parameterType="map" resultType="Issue" fetchSize="100000" databaseId="oracle">
+  <select id="selectIssueIds" parameterType="map" resultType="Issue" databaseId="oracle">
     select * from (select
       i.id <include refid="sortColumn"/>
       from issues i

diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml
index accae5e1b88fb2b8f7c43f24e4802b462f9c5022..5369af451489ac0837ef4f61b78b7b0c08e3a1cf 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueStatsMapper.xml
@@ -4,7 +4,7 @@
 
 <mapper namespace="org.sonar.core.issue.db.IssueStatsMapper">
 
-  <select id="selectIssuesColumn" parameterType="map" resultType="Object" fetchSize="100000">
+  <select id="selectIssuesColumn" parameterType="map" resultType="Object">
     select
     <if test="'ASSIGNEE'.equals(column)">
       i.assignee

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
index a0ac79e619f8551b9b2c9afbbb66a769cc471fe0..180725f7150f43a98e10f284f9fab7b30bee6fed 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
@@ -24,7 +24,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import org.apache.ibatis.executor.result.DefaultResultHandler;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.api.issue.IssueQuery;
 import org.sonar.api.rule.RuleKey;
@@ -333,7 +332,6 @@ public class IssueDaoTest extends AbstractDaoTestCase {
   }
 
   @Test
-  @Ignore
   public void should_select_issues_all_columns() {
     setupData("shared", "should_return_all_columns");