Fix for @options annotation and generated keys

Author: jeffgbutler

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

@@ -231,15 +231,11 @@ private void parseStatement(Method method) {
             keyGenerator = handleSelectKeyAnnotation(selectKey, mappedStatementId, getParameterType(method));
             keyProperty = selectKey.keyProperty();
         } else {
-          if (configuration.isUseGeneratedKeys()) {
-            if (options == null) {
-              keyGenerator = new Jdbc3KeyGenerator();
-            } else {
-              keyProperty = options.keyProperty();
-              keyGenerator = options.useGeneratedKeys() ? new Jdbc3KeyGenerator() : new NoKeyGenerator();
-            }
+          if (options == null) {
+              keyGenerator = configuration.isUseGeneratedKeys() ? new Jdbc3KeyGenerator() : new NoKeyGenerator();
           } else {
-            keyGenerator = new NoKeyGenerator();
+              keyGenerator = options.useGeneratedKeys() ? new Jdbc3KeyGenerator() : new NoKeyGenerator();
+              keyProperty = options.keyProperty();
           }
         }
       } else {

src/test/java/org/apache/ibatis/submitted/selectkey/AnnotatedMapper.java

@@ -2,6 +2,7 @@
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.SelectKey;
 
 public interface AnnotatedMapper {
@@ -10,6 +11,10 @@ public interface AnnotatedMapper {
     @SelectKey(statement="call identity()", keyProperty="nameId", before=false, resultType=int.class)
     int insertTable2(Name name);
 
+    @Insert("insert into table2 (name) values(#{name})")
+    @Options(useGeneratedKeys=true, keyProperty="nameId")
+    int insertTable2WithOptions(Name name);
+    
     @Insert("insert into table3 (id, name) values(#{nameId}, #{name})")
     @SelectKey(statement="call next value for TestSequence", keyProperty="nameId", before=true, resultType=int.class)
     int insertTable3(Name name);

src/test/java/org/apache/ibatis/submitted/selectkey/SelectKeyTest.java

@@ -109,6 +109,22 @@ public void testAnnotatedInsertTable2() {
       }
   }
 
+  @Test
+  public void testAnnotatedInsertTable2WithOptions() {
+      SqlSession sqlSession = sqlSessionFactory.openSession();
+
+      try {
+        Name name = new Name();
+        name.setName("barney");
+        AnnotatedMapper mapper = sqlSession.getMapper(AnnotatedMapper.class);
+        int rows = mapper.insertTable2WithOptions(name);
+        assertEquals(1, rows);
+        assertEquals(22, name.getNameId());
+      } finally {
+        sqlSession.close();
+      }
+  }
+
   @Test
   public void testAnnotatedInsertTable3() {
       SqlSession sqlSession = sqlSessionFactory.openSession();