Fixes #25. Check there is at least one result when executing the

selectKey statement

Author: emacarron

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

@@ -541,7 +541,7 @@ private KeyGenerator handleSelectKeyAnnotation(SelectKey selectKeyAnnotation, St
     SqlCommandType sqlCommandType = SqlCommandType.SELECT;
 
     assistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType, fetchSize, timeout, parameterMap, parameterTypeClass, resultMap, resultTypeClass, resultSetTypeEnum,
-        flushCache, useCache, false, // TODO issue #577
+        flushCache, useCache, false,
         keyGenerator, keyProperty, null, null, languageDriver);
 
     id = assistant.applyCurrentNamespace(id, false);

src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2012 The MyBatis Team
+ *    Copyright 2009-2013 The MyBatis Team
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import org.apache.ibatis.session.RowBounds;
 
 public class SelectKeyGenerator implements KeyGenerator {
+  
   public static final String SELECT_KEY_SUFFIX = "!selectKey";
   private boolean executeBefore;
   private MappedStatement keyStatement;
@@ -50,27 +51,24 @@ public void processAfter(Executor executor, MappedStatement ms, Statement stmt,
 
   private void processGeneratedKeys(Executor executor, MappedStatement ms, Object parameter) {
     try {
-      final Configuration configuration = ms.getConfiguration();
-      if (parameter != null) {
-        String keyStatementName = ms.getId() + SELECT_KEY_SUFFIX;
-        if (configuration.hasStatement(keyStatementName)) {
-
-          if (keyStatement != null && keyStatement.getKeyProperties() != null) {
-            String keyProperty = keyStatement.getKeyProperties()[0]; //just one key property is supported
-            final MetaObject metaParam = configuration.newMetaObject(parameter);
-            if (keyProperty != null && metaParam.hasSetter(keyProperty)) {
-              // Do not close keyExecutor.
-              // The transaction will be closed by parent executor.
-              Executor keyExecutor = configuration.newExecutor(executor.getTransaction(), ExecutorType.SIMPLE);
-              List<Object> values = keyExecutor.query(keyStatement, parameter, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
-              if (values.size() > 1) {
-                throw new ExecutorException("Select statement for SelectKeyGenerator returned more than one value.");
-              }
-              metaParam.setValue(keyProperty, values.get(0));
-            }
+      if (parameter != null && keyStatement != null && keyStatement.getKeyProperties() != null) {
+        String keyProperty = keyStatement.getKeyProperties()[0]; // just one key property is supported
+        final Configuration configuration = ms.getConfiguration();
+        final MetaObject metaParam = configuration.newMetaObject(parameter);
+        if (keyProperty != null && metaParam.hasSetter(keyProperty)) {
+          // Do not close keyExecutor.
+          // The transaction will be closed by parent executor.
+          Executor keyExecutor = configuration.newExecutor(executor.getTransaction(), ExecutorType.SIMPLE);
+          List<Object> values = keyExecutor.query(keyStatement, parameter, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
+          if (values.size() == 1) {
+            metaParam.setValue(keyProperty, values.get(0));
+          } else if (values.size() > 1) {
+            throw new ExecutorException("Select statement for SelectKeyGenerator returned more than one value.");
           }
         }
       }
+    } catch (ExecutorException e) {
+      throw e;
     } catch (Exception e) {
       throw new ExecutorException("Error selecting key or setting result to parameter object. Cause: " + e, e);
     }

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

@@ -21,7 +21,7 @@
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -107,6 +107,22 @@ public void testInsertTable2() {
       sqlSession.close();
     }
   }
+
+  @Test
+  public void testInsertTable3() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+
+    try {
+      Map<String, String> parms = new HashMap<String, String>();
+      parms.put("name", "Fred");
+      int rows = sqlSession.insert("org.apache.ibatis.submitted.selectkey.Table2.insertNoValuesInSelectKey", parms);
+      assertEquals(1, rows);
+      assertNull(parms.get("id"));
+
+    } finally {
+      sqlSession.close();
+    }
+  }
 
   @Test
   public void testAnnotatedInsertTable2() {

src/test/java/org/apache/ibatis/submitted/selectkey/Table2.xml

@@ -24,4 +24,12 @@
       CALL IDENTITY()
     </selectKey>
   </insert>
+  
+  <insert id="insertNoValuesInSelectKey" parameterType="map">
+    insert into table2 (name) values (#{name})
+    <selectKey resultType="java.lang.Integer" keyProperty="id">
+      select * from table2 where name = 'xxx'
+    </selectKey>
+  </insert>
+  
 </mapper>