From 76b88cf1f5f42d331ad02df55a083325226c6224 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 31 Oct 2014 09:24:49 +0100
Subject: SONAR-5606 refactor MyBatis configuration of result set scrolling

---
 .../src/main/java/org/sonar/server/db/migrations/SelectImpl.java   | 7 +------
 .../src/test/resources/org/sonar/server/db/fake/FakeMapper.xml     | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'server')

diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java
index b49fc88edee..11243866258 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java
@@ -21,7 +21,6 @@ package org.sonar.server.db.migrations;
 
 import org.apache.commons.dbutils.DbUtils;
 import org.sonar.core.persistence.Database;
-import org.sonar.core.persistence.dialect.MySql;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -83,11 +82,7 @@ class SelectImpl extends BaseSqlStatement<Select> implements Select {
 
   static SelectImpl create(Database db, Connection connection, String sql) throws SQLException {
     PreparedStatement pstmt = connection.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-    if (db.getDialect().getId().equals(MySql.ID)) {
-      pstmt.setFetchSize(Integer.MIN_VALUE);
-    } else {
-      pstmt.setFetchSize(1000);
-    }
+    pstmt.setFetchSize(db.getDialect().getScrollDefaultFetchSize());
     return new SelectImpl(pstmt);
   }
 }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/db/fake/FakeMapper.xml b/server/sonar-server/src/test/resources/org/sonar/server/db/fake/FakeMapper.xml
index 3ab38789b2d..ade40876332 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/db/fake/FakeMapper.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/db/fake/FakeMapper.xml
@@ -21,7 +21,7 @@
     values (#{key}, #{createdAt}, #{updatedAt})
   </insert>
 
-  <select id="selectAfterDate" resultType="fake" resultSetType="FORWARD_ONLY" fetchSize="200">
+  <select id="selectAfterDate" resultType="fake" fetchSize="${_scrollFetchSize}" resultSetType="FORWARD_ONLY">
     select
     <include refid="selectColumns"/>
     from fake f
-- 
cgit v1.2.3