Add 'resultSets' attribute to @select annotation #611

src/main/java/org/apache/ibatis/annotations/Options.java

@@ -59,4 +59,6 @@ public enum FlushCachePolicy {
   String keyProperty() default "id";
 
   String keyColumn() default "";
+
+  String resultSets() default "";
 }

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -346,7 +346,7 @@ void parseStatement(Method method) {
           null,
           languageDriver,
           // ResultSets
-          null);
+          options != null ? nullOrEmpty(options.resultSets()) : null);
     }
   }
 

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

@@ -15,10 +15,20 @@
  */
 package org.apache.ibatis.submitted.multipleresultsetswithassociation;
 
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.mapping.StatementType;
+
 import java.util.List;
 
 public interface Mapper {
 
   List<OrderDetail> getOrderDetailsWithHeaders();
 
+  @Select(value = "{ call GetOrderDetailsAndHeaders() }")
+  @ResultMap("orderDetailResultMap")
+  @Options(statementType= StatementType.CALLABLE, resultSets="orderDetailResultSet,orderHeaderResultSet")
+  List<OrderDetail> getOrderDetailsWithHeadersAnnotationBased();
+
 }

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

@@ -92,4 +92,26 @@ public void shouldGetOrderDetailsEachHavingAnOrderHeader() throws IOException {
     }
   }
 
+  @Test
+  public void shouldGetOrderDetailsEachHavingAnOrderHeaderAnnotationBased() throws IOException {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      List<OrderDetail> orderDetails = mapper.getOrderDetailsWithHeadersAnnotationBased();
+
+      // 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();
+    }
+  }
+
 }