Additional tests for #167.

Author: emacarron

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

@@ -499,19 +499,11 @@ private String nestedSelectId(Result result) {
   }
 
   private boolean isLazy(Result result) {
-    Boolean isLazy = null;
-    if (FetchType.DEFAULT != result.one().fetchType()) {
+    Boolean isLazy = configuration.isLazyLoadingEnabled();
+    if (result.one().select().length() > 0 && FetchType.DEFAULT != result.one().fetchType()) {
       isLazy = (result.one().fetchType() == FetchType.LAZY);
-    }
-    if (FetchType.DEFAULT != result.many().fetchType()) {
-      if (isLazy == null) {
-        isLazy = (result.many().fetchType() == FetchType.LAZY);
-      } else {
-        throw new BuilderException("Cannot use both @One and @Many annotations in the same @Result");
-      }
-    }
-    if (isLazy == null) {
-      isLazy = configuration.isLazyLoadingEnabled();
+    } else if (result.many().select().length() > 0 && FetchType.DEFAULT != result.many().fetchType()) {
+      isLazy = (result.many().fetchType() == FetchType.LAZY);
     }
     return isLazy;
   }

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

@@ -0,0 +1,42 @@
+/*
+ *    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.binding;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Many;
+import org.apache.ibatis.annotations.One;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+
+import domain.blog.Blog;
+
+public interface MapperWithOneAndMany {
+    
+    @Select({
+        "SELECT *",
+        "FROM blog"
+    })
+    @Results({ 
+        @Result(
+               property = "author", column = "author_id", 
+               one = @One(select = "org.apache.ibatis.binding.BoundAuthorMapper.selectAuthor"), 
+               many = @Many(select = "selectPostsById"))
+    })
+    List<Blog> selectWithBothOneAndMany();    
+    
+}

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

@@ -0,0 +1,29 @@
+/*
+ *    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.binding;
+
+import org.apache.ibatis.session.Configuration;
+import org.junit.Test;
+
+public class WrongMapperTest {
+
+  @Test(expected = RuntimeException.class)
+  public void shouldFailForBothOneAndMany() throws Exception {
+    Configuration configuration = new Configuration();
+    configuration.addMapper(MapperWithOneAndMany.class);
+  }
+
+}