Fixes #167. @one is broken in 3.2.6

Author: emacarron

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

@@ -517,13 +517,10 @@ private boolean isLazy(Result result) {
   }
 
   private boolean hasNestedSelect(Result result) {
-    boolean hasNestedSelect = result.one().select().length() > 0;
-    if (hasNestedSelect) {
+    if (result.one().select().length() > 0 && result.many().select().length() > 0) {
       throw new BuilderException("Cannot use both @One and @Many annotations in the same @Result");
-    } else {
-      hasNestedSelect = result.many().select().length() > 0;
     }
-    return hasNestedSelect;  
+    return result.one().select().length() > 0 || result.many().select().length() > 0;  
   }
 
   private void applyConstructorArgs(Arg[] args, Class<?> resultType, List<ResultMapping> resultMappings) {

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

@@ -190,6 +190,20 @@ public void shouldExecuteBoundSelectListOfBlogsStatement() {
     }
   }
 
+  @Test
+  public void shouldGetBlogsWithAuthors() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      List<Blog> blogs = mapper.selectBlogsWithAutors();
+      assertEquals(2, blogs.size());
+      assertEquals(101, blogs.get(0).getAuthor().getId());
+      assertEquals(102, blogs.get(1).getAuthor().getId());
+    } finally {
+      session.close();
+    }
+  }
+  
   @Test
   public void shouldExecuteBoundSelectMapOfBlogsById() {
     SqlSession session = sqlSessionFactory.openSession();

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

@@ -166,5 +166,12 @@ List<Post> selectPostsLikeSubjectAndBody(RowBounds bounds,
       "WHERE ${column} = #{id} AND title = #{value}")
   Blog selectBlogWithAParamNamedValue(@Param("column") String column, @Param("id") int id, @Param("value") String title);
 
+  @Select({
+      "SELECT *",
+      "FROM blog"
+  })
+  @Results({ @Result(property = "author", column = "author_id", one = @One(select = "org.apache.ibatis.binding.BoundAuthorMapper.selectAuthor")) })
+  List<Blog> selectBlogsWithAutors();
+
 
 }