diff options
| author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-07-01 09:58:35 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-07-01 09:58:35 +0200 |
| commit | ef13b800afbfcff58848837ec00607375d732454 (patch) | |
| tree | 9ee46cad1cb2b43620e3f833899a2ecd3a394129 /sonar-core | |
| parent | aace022ee2da8922b425724b81476393e3d0a7cb (diff) | |
| download | sonarqube-ef13b800afbfcff58848837ec00607375d732454.tar.gz sonarqube-ef13b800afbfcff58848837ec00607375d732454.zip | |
Remove fetchSize in issues SQL and reactivate previously deactivated unit test
Diffstat (limited to 'sonar-core')
3 files changed, 5 insertions, 7 deletions
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 2cb15386ef9..9304f859bfb 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 @@ -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 accae5e1b88..5369af45148 100644 --- 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 a0ac79e619f..180725f7150 100644 --- 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"); |