http://code.google.com/p/mybatis/issues/detail?id=43 . Maps keys are wrong when using mapUnderscoreToCamelCase=true

Author: emacarron

src/main/java/org/apache/ibatis/executor/resultset/FastResultSetHandler.java

@@ -269,11 +269,10 @@ protected Object getPropertyMappingValue(ResultSet rs, MetaObject metaResultObje
     return null;
   }
 
-  protected boolean applyAutomaticMappings(ResultSet rs, List<String> unmappedColumnNames, MetaObject metaObject, boolean useCamelCaseMapping) throws SQLException {
+  protected boolean applyAutomaticMappings(ResultSet rs, List<String> unmappedColumnNames, MetaObject metaObject, boolean mapUnderscoreToCamelCase ) throws SQLException {
     boolean foundValues = false;
     for (String columnName : unmappedColumnNames) {
-      final String propertyName = useCamelCaseMapping ? columnName.replace("_", "") : columnName;
-      final String property = metaObject.findProperty(propertyName);
+      final String property = metaObject.findProperty(columnName, mapUnderscoreToCamelCase );
       if (property != null) {
         final Class propertyType = metaObject.getSetterType(property);
         if (typeHandlerRegistry.hasTypeHandler(propertyType)) {

src/main/java/org/apache/ibatis/reflection/MetaObject.java

@@ -62,8 +62,8 @@ public Object getOriginalObject() {
     return originalObject;
   }
 
-  public String findProperty(String propName) {
-    return objectWrapper.findProperty(propName);
+  public String findProperty(String propName, boolean useCamelCaseMapping) {    
+    return objectWrapper.findProperty(propName, useCamelCaseMapping);
   }
 
   public String[] getGetterNames() {

src/main/java/org/apache/ibatis/reflection/wrapper/BeanWrapper.java

@@ -37,7 +37,10 @@ public void set(PropertyTokenizer prop, Object value) {
     }
   }
 
-  public String findProperty(String name) {
+  public String findProperty(String name, boolean useCamelCaseMapping) {
+    if (useCamelCaseMapping) {
+      name = name.replace("_", "");
+    }
     return metaClass.findProperty(name);
   }
 

src/main/java/org/apache/ibatis/reflection/wrapper/MapWrapper.java

@@ -34,7 +34,7 @@ public void set(PropertyTokenizer prop, Object value) {
     }
   }
 
-  public String findProperty(String name) {
+  public String findProperty(String name, boolean useCamelCaseMapping) {
     return name;
   }
 

src/main/java/org/apache/ibatis/reflection/wrapper/ObjectWrapper.java

@@ -10,7 +10,7 @@ public interface ObjectWrapper {
 
   void set(PropertyTokenizer prop, Object value);
 
-  String findProperty(String name);
+  String findProperty(String name, boolean useCamelCaseMapping);
 
   String[] getGetterNames();
 

src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java

@@ -47,7 +47,7 @@ public static void setUp() throws Exception {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void testIt() {
+	public void testList() {
 		SqlSession sqlSession = sqlSessionFactory.openSession();
 		try {
 			List<Camel> list = sqlSession.selectList("org.apache.ibatis.submitted.camel.doSelect");
@@ -59,4 +59,17 @@ public void testIt() {
 		}
 	}
 
+  @SuppressWarnings("unchecked")
+  @Test
+  public void testMap() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      List list = sqlSession.selectList("org.apache.ibatis.submitted.camel.doSelectMap");
+      Assert.assertTrue(list.size() > 0);
+      Assert.assertTrue(Map.class.cast(list.get(0)).containsKey("LAST_NAME"));
+    } finally {
+      sqlSession.close();
+    }
+  }
+	
 }

src/test/java/org/apache/ibatis/submitted/camelcase/Map.xml

@@ -9,4 +9,8 @@
 		select * from names
 	</select>
 
+	<select id="doSelectMap" resultType="map">
+		select * from names
+	</select>
+
 </mapper>