fixes #556 Passing JDBC type when getting type handler for generated keys.

Author: harawata

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

@@ -26,6 +26,7 @@
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.TypeHandler;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 
@@ -61,7 +62,7 @@ public void processBatch(MappedStatement ms, Statement stmt, Collection<Object>
           }
           final MetaObject metaParam = configuration.newMetaObject(parameter);
           if (typeHandlers == null) {
-            typeHandlers = getTypeHandlers(typeHandlerRegistry, metaParam, keyProperties);
+            typeHandlers = getTypeHandlers(typeHandlerRegistry, metaParam, keyProperties, rsmd);
           }
           populateKeys(rs, metaParam, keyProperties, typeHandlers);
         }
@@ -100,12 +101,12 @@ private Collection<Object> getParameters(Object parameter) {
     return parameters;
   }
 
-  private TypeHandler<?>[] getTypeHandlers(TypeHandlerRegistry typeHandlerRegistry, MetaObject metaParam, String[] keyProperties) {
+  private TypeHandler<?>[] getTypeHandlers(TypeHandlerRegistry typeHandlerRegistry, MetaObject metaParam, String[] keyProperties, ResultSetMetaData rsmd) throws SQLException {
     TypeHandler<?>[] typeHandlers = new TypeHandler<?>[keyProperties.length];
     for (int i = 0; i < keyProperties.length; i++) {
       if (metaParam.hasSetter(keyProperties[i])) {
         Class<?> keyPropertyType = metaParam.getSetterType(keyProperties[i]);
-        TypeHandler<?> th = typeHandlerRegistry.getTypeHandler(keyPropertyType);
+        TypeHandler<?> th = typeHandlerRegistry.getTypeHandler(keyPropertyType, JdbcType.forCode(rsmd.getColumnType(i + 1)));
         typeHandlers[i] = th;
       }
     }

src/test/java/org/apache/ibatis/submitted/typehandler/CreateDB.sql

@@ -15,6 +15,7 @@
 --
 
 drop table users if exists;
+drop table product if exists;
 
 create table users (
   id int,
@@ -23,4 +24,9 @@ create table users (
   state char(20)
 );
 
+create table product (
+  id int identity,
+  name varchar(20)
+);
+
 insert into users (id, name, city, state) values(1, '   User1', '  Carmel  ', '  IN ');

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

@@ -15,6 +15,10 @@
  */
 package org.apache.ibatis.submitted.typehandler;
 
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
@@ -30,4 +34,10 @@ public interface Mapper {
     @Result(column="state", property="state", jdbcType=JdbcType.VARCHAR)
   })
   User getUser(Integer id);
+
+  @Insert({
+    "insert into product (name) values (#{name})"
+  })
+  @Options(useGeneratedKeys = true, keyProperty = "id")
+  int insertProduct(Product product);
 }

src/test/java/org/apache/ibatis/submitted/typehandler/Product.java

@@ -0,0 +1,83 @@
+/**
+ *    Copyright 2009-2016 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.submitted.typehandler;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+public class Product {
+
+  private ProductId id;
+
+  private String name;
+
+  public ProductId getId() {
+    return id;
+  }
+
+  public void setId(ProductId id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public static class ProductId {
+    private Integer value;
+
+    private ProductId(Integer value) {
+      super();
+      this.value = value;
+    }
+
+    public Integer getValue() {
+      return value;
+    }
+  }
+
+  public static class ProductIdTypeHandler extends BaseTypeHandler<ProductId> {
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, ProductId parameter, JdbcType jdbcType) throws SQLException {
+      ps.setInt(i, parameter.getValue());
+    }
+
+    @Override
+    public ProductId getNullableResult(ResultSet rs, String columnName) throws SQLException {
+      return new ProductId(rs.getInt(columnName));
+    }
+
+    @Override
+    public ProductId getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+      return new ProductId(rs.getInt(columnIndex));
+    }
+
+    @Override
+    public ProductId getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+      return new ProductId(cs.getInt(columnIndex));
+    }
+  }
+}

src/test/java/org/apache/ibatis/submitted/typehandler/TypeHandlerTest.java

@@ -15,8 +15,12 @@
  */
 package org.apache.ibatis.submitted.typehandler;
 
+import static org.junit.Assert.*;
+
 import java.io.Reader;
 import java.sql.Connection;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
@@ -65,4 +69,18 @@ public void shouldGetAUser() {
     }
   }
 
+  @Test
+  public void shouldApplyTypeHandlerOnGeneratedKey() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Product product = new Product();
+      product.setName("new product");
+      mapper.insertProduct(product);
+      assertNotNull(product.getId());
+      assertNotNull(product.getId().getValue());
+    } finally {
+      sqlSession.close();
+    }
+  }
 }

src/test/java/org/apache/ibatis/submitted/typehandler/mybatis-config.xml

@@ -20,6 +20,13 @@
 
 <configuration>
 
+	<typeHandlers>
+		<typeHandler
+			handler="org.apache.ibatis.submitted.typehandler.Product$ProductIdTypeHandler"
+			javaType="org.apache.ibatis.submitted.typehandler.Product$ProductId"
+			jdbcType="INTEGER" />
+	</typeHandlers>
+
 	<environments default="development">
 		<environment id="development">
 			<transactionManager type="JDBC">