Merge pull request #1383 from berniegp/berniegp/1381

A failing test case for #1381 .

Author: harawata

src/test/java/org/apache/ibatis/submitted/associationtest/AssociationTest.java

@@ -79,5 +79,20 @@ public void shouldGetAllCarsNonUnique() {
       Assert.assertEquals(1, cars.size());
     }
   }
+  
+  @Test
+  public void shouldGetAllCarsAndDetectAssociationType() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      List<Car> cars = mapper.getCarsAndDetectAssociationType();
+      Assert.assertEquals(4, cars.size());
+      Assert.assertEquals("VW", cars.get(0).getType());
+      Assert.assertNotNull(cars.get(0).getEngine());
+      Assert.assertNull(cars.get(0).getBrakes());
+      Assert.assertEquals("Opel", cars.get(1).getType());
+      Assert.assertNull(cars.get(1).getEngine());
+      Assert.assertNotNull(cars.get(1).getBrakes());
+    }
+  }
 
 }

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

@@ -21,6 +21,5 @@ public interface Mapper {
 
   List<Car> getCars();
   List<Car> getCars2();
-  List<Car> getCars3();
-
+  List<Car> getCarsAndDetectAssociationType();
 }

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

@@ -40,12 +40,24 @@
     select * from cars
   </select>
 
-  <select id="getCarsNonUnique" resultMap="carResult">
-    select 1 as carid, cartype, enginetype, enginecylinders, brakestype from cars
-  </select>
-  
   <select id="getCars2" resultMap="carResult">
     select 1 as carid, cartype, enginetype, enginecylinders, brakestype from cars where carid in (1,2)
   </select>
 
+  <resultMap type="org.apache.ibatis.submitted.associationtest.Car" id="carResultTypeDetect">
+    <id column="carid" property="id"/>
+    <result column="cartype" property="type"/>
+    <association property="engine">
+      <result column="enginetype" property="type"/>
+      <result column="enginecylinders" property="cylinders"/>
+    </association>
+    <association property="brakes">
+      <result column="brakesType" property="type"/>
+    </association>
+  </resultMap>
+    
+  <select id="getCarsAndDetectAssociationType" resultMap="carResultTypeDetect">
+    select * from cars
+  </select>
+  
 </mapper>