Merge of fix for #255 into 3.2.x branch

Author: emacarron

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -78,7 +78,7 @@ public class DefaultResultSetHandler implements ResultSetHandler {
 
   // multiple resultsets
   private final Map<String, ResultMapping> nextResultMaps = new HashMap<String, ResultMapping>();
-  private final Map<CacheKey, PendingRelation> pendingRelations = new HashMap<CacheKey, PendingRelation>();
+  private final Map<CacheKey, List<PendingRelation>> pendingRelations = new HashMap<CacheKey, List<PendingRelation>>();
 
   private static class PendingRelation {
     public MetaObject metaObject;
@@ -295,7 +295,7 @@ private void handleRowValuesForSimpleResultMap(ResultSetWrapper rsw, ResultMap r
 
   private void storeObject(ResultHandler resultHandler, DefaultResultContext resultContext, Object rowValue, ResultMapping parentMapping, ResultSet rs) throws SQLException {
     if (parentMapping != null) {
-      linkToParent(rs, parentMapping, rowValue);
+      linkToParents(rs, parentMapping, rowValue);
     } else {
       callResultHandler(resultHandler, resultContext, rowValue);
     }
@@ -425,17 +425,19 @@ private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap
 
   // MULTIPLE RESULT SETS
 
-  private void linkToParent(ResultSet rs, ResultMapping parentMapping, Object rowValue) throws SQLException {
+  private void linkToParents(ResultSet rs, ResultMapping parentMapping, Object rowValue) throws SQLException {
     CacheKey parentKey = createKeyForMultipleResults(rs, parentMapping, parentMapping.getColumn(), parentMapping.getForeignColumn());
-    PendingRelation parent = pendingRelations.get(parentKey);
-    if (parent != null) {
-      final Object collectionProperty = instantiateCollectionPropertyIfAppropriate(parent.propertyMapping, parent.metaObject);
-      if (rowValue != null) {
-        if (collectionProperty != null) {
-          final MetaObject targetMetaObject = configuration.newMetaObject(collectionProperty);
-          targetMetaObject.add(rowValue);
-        } else {
-          parent.metaObject.setValue(parent.propertyMapping.getProperty(), rowValue);
+    List<PendingRelation> parents = pendingRelations.get(parentKey);
+    for (PendingRelation parent : parents) {
+      if (parent != null) {
+        final Object collectionProperty = instantiateCollectionPropertyIfAppropriate(parent.propertyMapping, parent.metaObject);
+        if (rowValue != null) {
+          if (collectionProperty != null) {
+            final MetaObject targetMetaObject = configuration.newMetaObject(collectionProperty);
+            targetMetaObject.add(rowValue);
+          } else {
+            parent.metaObject.setValue(parent.propertyMapping.getProperty(), rowValue);
+          }
         }
       }
     }
@@ -469,7 +471,13 @@ private void addPendingChildRelation(ResultSet rs, MetaObject metaResultObject,
     PendingRelation deferLoad = new PendingRelation();
     deferLoad.metaObject = metaResultObject;
     deferLoad.propertyMapping = parentMapping;
-    pendingRelations.put(cacheKey, deferLoad);
+    List<PendingRelation> relations = pendingRelations.get(cacheKey);
+    // issue #255
+    if (relations == null) {
+      relations = new ArrayList<DefaultResultSetHandler.PendingRelation>();
+      pendingRelations.put(cacheKey, relations);
+    }
+    relations.add(deferLoad);
     ResultMapping previous = nextResultMaps.get(parentMapping.getResultSet());
     if (previous == null) {
       nextResultMaps.put(parentMapping.getResultSet(), parentMapping);

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/CreateDB1.sql

@@ -0,0 +1,33 @@
+--       Copyright 2009-2012 the original author or authors.
+--
+--       Licensed under the Apache License, Version 2.0 (the "License");
+--       you may not use this file except in compliance with the License.
+--       You may obtain a copy of the License at
+--
+--          http://www.apache.org/licenses/LICENSE-2.0
+--
+--       Unless required by applicable law or agreed to in writing, software
+--       distributed under the License is distributed on an "AS IS" BASIS,
+--       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--       See the License for the specific language governing permissions and
+--       limitations under the License.
+
+    DROP PROCEDURE GetOrderDetailsAndHeaders IF EXISTS;
+    DROP TABLE order_detail IF EXISTS;
+    DROP TABLE order_header IF EXISTS;
+
+    CREATE TABLE order_detail
+    (
+        order_id integer NOT NULL,
+        line_number integer NOT NULL,
+        quantity integer NOT NULL,
+        item_description varchar(50) NOT NULL,
+        PRIMARY KEY (order_id, line_number)
+    );
+
+    CREATE TABLE order_header
+    (
+        order_id integer NOT NULL,
+        cust_name varchar(50) NOT NULL,
+        PRIMARY KEY (order_id)
+    );

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/CreateDB2.sql

@@ -0,0 +1,30 @@
+--       Copyright 2009-2012 the original author or authors.
+--
+--       Licensed under the Apache License, Version 2.0 (the "License");
+--       you may not use this file except in compliance with the License.
+--       You may obtain a copy of the License at
+--
+--          http://www.apache.org/licenses/LICENSE-2.0
+--
+--       Unless required by applicable law or agreed to in writing, software
+--       distributed under the License is distributed on an "AS IS" BASIS,
+--       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--       See the License for the specific language governing permissions and
+--       limitations under the License.
+
+    CREATE PROCEDURE GetOrderDetailsAndHeaders()
+        READS SQL DATA
+        DYNAMIC RESULT SETS 1
+        BEGIN ATOMIC
+
+        DECLARE result1 CURSOR FOR
+        SELECT * FROM order_detail
+        FOR READ ONLY ;
+ 
+        DECLARE result2 CURSOR FOR
+        SELECT * FROM order_header
+        FOR READ ONLY ;
+  
+        OPEN result1 ;
+        OPEN result2 ;
+    END;

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/CreateDB3.sql

@@ -0,0 +1,31 @@
+--       Copyright 2009-2012 the original author or authors.
+--
+--       Licensed under the Apache License, Version 2.0 (the "License");
+--       you may not use this file except in compliance with the License.
+--       You may obtain a copy of the License at
+--
+--          http://www.apache.org/licenses/LICENSE-2.0
+--
+--       Unless required by applicable law or agreed to in writing, software
+--       distributed under the License is distributed on an "AS IS" BASIS,
+--       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--       See the License for the specific language governing permissions and
+--       limitations under the License.
+
+    INSERT INTO order_header(order_id, cust_name)
+        VALUES (1, 'Fred');
+    INSERT INTO order_header(order_id, cust_name)
+        VALUES (2, 'Barney');
+
+    INSERT INTO order_detail(order_id, line_number, quantity, item_description)
+        VALUES (1, 1, 1, 'Pen');
+    INSERT INTO order_detail(order_id, line_number, quantity, item_description)
+        VALUES (1, 2, 3, 'Pencil');
+    INSERT INTO order_detail(order_id, line_number, quantity, item_description)
+        VALUES (1, 3, 2, 'Notepad');
+    INSERT INTO order_detail(order_id, line_number, quantity, item_description)
+        VALUES (2, 1, 1, 'Compass');
+    INSERT INTO order_detail(order_id, line_number, quantity, item_description)
+        VALUES (2, 2, 1, 'Protractor');
+    INSERT INTO order_detail(order_id, line_number, quantity, item_description)
+        VALUES (2, 3, 2, 'Pencil');

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/Mapper.java

@@ -0,0 +1,24 @@
+/*
+ *    Copyright 2009-2012 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.submitted.multipleresultsetswithassociation;
+
+import java.util.List;
+
+public interface Mapper {
+
+  List<OrderDetail> getOrderDetailsWithHeaders();
+
+}

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/Mapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+       Copyright 2009-2012 the original author or authors.
+
+       Licensed under the Apache License, Version 2.0 (the "License");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+-->
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.multipleresultsetswithassociation.Mapper">
+    
+    <select id="getOrderDetailsWithHeaders" resultSets="orderDetailResultSet,orderHeaderResultSet" resultMap="orderDetailResultMap" statementType="CALLABLE">
+        { call GetOrderDetailsAndHeaders() }
+    </select>
+
+    <resultMap type="org.apache.ibatis.submitted.multipleresultsetswithassociation.OrderDetail" id="orderDetailResultMap">
+        <id property="orderId" column="order_id"/>
+        <id property="lineNumber" column="line_number"/>
+        <association property="orderHeader" column="order_id" foreignColumn="order_id"
+                     resultSet="orderHeaderResultSet" resultMap="orderHeaderResultMap" />
+    </resultMap>
+	
+    <resultMap type="org.apache.ibatis.submitted.multipleresultsetswithassociation.OrderHeader" id="orderHeaderResultMap">
+        <id property="orderId" column="order_id"/>
+    </resultMap>
+	
+</mapper>

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/MultipleResultSetTest.java

@@ -0,0 +1,95 @@
+/*
+ *    Copyright 2009-2012 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.submitted.multipleresultsetswithassociation;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.sql.Connection;
+import java.util.List;
+
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/*
+ * This class contains tests for multiple result sets with an association mapping.
+ * This test is based on the org.apache.ibatis.submitted.multiple_resultsets test.
+ * 
+ */
+public class MultipleResultSetTest {
+
+  private static SqlSessionFactory sqlSessionFactory;
+
+  @BeforeClass
+  public static void setUp() throws Exception {
+    Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/multipleresultsetswithassociation/mybatis-config.xml");
+    sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    reader.close();
+    
+    // populate in-memory database
+    // Could not get the table creation, procedure creation, and data population to work from the same script.
+    // Once it was in three scripts, all seemed well.
+    SqlSession session = sqlSessionFactory.openSession();
+    Connection conn = session.getConnection();
+    reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/multipleresultsetswithassociation/CreateDB1.sql");
+    runReaderScript(conn, session, reader);
+    reader.close();
+    reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/multipleresultsetswithassociation/CreateDB2.sql");
+    runReaderScript(conn, session, reader);
+    reader.close();
+    reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/multipleresultsetswithassociation/CreateDB3.sql");
+    runReaderScript(conn, session, reader);
+    reader.close();
+    session.close();
+  }
+  
+  private static void runReaderScript(Connection conn, SqlSession session, Reader reader) throws Exception {
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setLogWriter(null);
+    runner.setSendFullScript(true);
+    runner.setAutoCommit(true);
+    runner.setStopOnError(false);
+    runner.runScript(reader);
+  }
+
+  @Test
+  public void shouldGetOrderDetailsEachHavingAnOrderHeader() throws IOException {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      List<OrderDetail> orderDetails = mapper.getOrderDetailsWithHeaders();
+      
+      // There are six order detail records in the database
+      // As long as the data does not change this should be successful
+      Assert.assertEquals(6, orderDetails.size());
+      
+      // Each order detail should have a corresponding OrderHeader
+      // Only 2 of 6 orderDetails have orderHeaders
+      for(OrderDetail orderDetail : orderDetails){
+          Assert.assertNotNull(orderDetail.getOrderHeader());
+      }
+      
+    } finally {
+      sqlSession.close();
+    }
+  }
+
+}

src/test/java/org/apache/ibatis/submitted/multipleresultsetswithassociation/OrderDetail.java

@@ -0,0 +1,66 @@
+/*
+ *    Copyright 2009-2012 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.submitted.multipleresultsetswithassociation;
+
+public class OrderDetail {
+
+  private int orderId;
+  private int lineNumber;
+  private int quantity;
+  private String itemDescription;
+  
+  private OrderHeader orderHeader;
+
+  public int getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(int orderId) {
+    this.orderId = orderId;
+  }
+
+  public int getLineNumber() {
+    return lineNumber;
+  }
+
+  public void setLineNumber(int lineNumber) {
+    this.lineNumber = lineNumber;
+  }
+
+  public int getQuantity() {
+    return quantity;
+  }
+
+  public void setQuantity(int quantity) {
+    this.quantity = quantity;
+  }
+
+  public String getItemDescription() {
+    return itemDescription;
+  }
+
+  public void setItemDescription(String itemDescription) {
+    this.itemDescription = itemDescription;
+  }
+
+  public OrderHeader getOrderHeader() {
+      return orderHeader;
+  }
+
+  public void setOrderHeader(OrderHeader orderHeader) {
+      this.orderHeader = orderHeader;
+  }
+}