1) Partial fix for http://code.google.com/p/mybatis/issues/detail?id=139 (257) -- Cache causes selectMap to fail

2) Fixed a few old unit tests.

Author: cbegin

src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java

@@ -5,11 +5,9 @@
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.ErrorContext;
 import org.apache.ibatis.executor.result.DefaultMapResultHandler;
+import org.apache.ibatis.executor.result.DefaultResultContext;
 import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.*;
 
 import java.sql.Connection;
 import java.util.HashMap;
@@ -56,8 +54,13 @@ public Map selectMap(String statement, Object parameter, String mapKey) {
   }
 
   public Map selectMap(String statement, Object parameter, String mapKey, RowBounds rowBounds) {
+    final List list = selectList(statement, parameter, rowBounds);
     final DefaultMapResultHandler mapResultHandler = new DefaultMapResultHandler(mapKey);
-    select(statement, parameter, rowBounds, mapResultHandler);
+    final DefaultResultContext context = new DefaultResultContext();
+    for (Object o : list) {
+      context.nextResultObject(o);
+      mapResultHandler.handleResult(context);
+    }
     return mapResultHandler.getMappedResults();
   }
 

src/test/java/com/ibatis/sqlmap/jira/JiraIbatis260.java

@@ -47,7 +47,11 @@ protected void setUp() throws Exception {
    * @throws Exception none should be thrown (if the regression test
    *                   succeeds)
    */
-  public void testIbatis260Error1() throws Exception {
+  public void __ignore_testIbatis260Error1() throws Exception {
+    // @IGNORE
+    // Was missed a long time ago, probably around the time Maven was implemented.
+    // It's not picked up due to the filename, and is not being run.  The mock Sql/Include tags
+    // seem to have broken at some point, which stops this test from running.
     List groupedResult = sqlMap.queryForList("getJira260GroupedResult", null);
 
     HashMap test = new HashMap();

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -136,8 +136,7 @@ public void shouldExecuteBoundSelectMapOfBlogsById() {
   }
 
   @Test
-  @Ignore
-  public void shouldExecuteMultipleBoundSelectMapOfBlogsById() {
+  public void shouldExecuteMultipleBoundSelectMapOfBlogsByIdInSameSessionWithoutClearingLocalCache() {
     SqlSession session = sqlSessionFactory.openSession();
     try {
       BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
@@ -156,6 +155,31 @@ public void shouldExecuteMultipleBoundSelectMapOfBlogsById() {
     }
   }
 
+  @Test
+  public void shouldExecuteMultipleBoundSelectMapOfBlogsByIdBetweenTwoSessionsWithGlobalCacheEnabled() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      Map<Integer,Blog> blogs = mapper.selectBlogsAsMapById();
+      session.close();
+
+      //New Session
+      session = sqlSessionFactory.openSession();
+      mapper = session.getMapper(BoundBlogMapper.class);
+      Map<Integer,Blog> moreBlogs = mapper.selectBlogsAsMapById();
+      assertEquals(2, blogs.size());
+      assertEquals(2, moreBlogs.size());
+      for(Map.Entry<Integer,Blog> blogEntry : blogs.entrySet()) {
+        assertEquals(blogEntry.getKey(), (Integer) blogEntry.getValue().getId());
+      }
+      for(Map.Entry<Integer,Blog> blogEntry : moreBlogs.entrySet()) {
+        assertEquals(blogEntry.getKey(), (Integer) blogEntry.getValue().getId());
+      }
+    } finally {
+      session.close();
+    }
+  }
+
   @Test
   public void shouldSelectListOfBlogsUsingXMLConfig() {
     SqlSession session = sqlSessionFactory.openSession();

src/test/java/org/apache/ibatis/submitted/encoding/EncodingConfig.xml

@@ -13,7 +13,7 @@
       </transactionManager>
       <dataSource type="UNPOOLED">
         <property name="driver" value="org.hsqldb.jdbcDriver"/>
-        <property name="url" value="jdbc:hsqldb:mem:gname"/>
+        <property name="url" value="jdbc:hsqldb:mem:encoding"/>
         <property name="username" value="sa"/>
       </dataSource>
     </environment>

src/test/java/org/apache/ibatis/submitted/encoding/EncodingTest.java

@@ -24,7 +24,7 @@ public static void setUp() throws Exception {
 
     try {
       Class.forName("org.hsqldb.jdbcDriver");
-      conn = DriverManager.getConnection("jdbc:hsqldb:mem:gname", "sa", "");
+      conn = DriverManager.getConnection("jdbc:hsqldb:mem:encoding", "sa", "");
 
       Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/encoding/CreateDB.sql");