fixes #107 Auto-mapping + columnPrefix fails under case-sensitive database engines. Normalize unmapped column names to uppercase before searching columnPrefix.

Author: harawata

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

@@ -402,7 +402,7 @@ private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap
       if (columnPrefix != null && columnPrefix.length() > 0) {
         // When columnPrefix is specified,
         // ignore columns without the prefix.
-        if (columnName.startsWith(columnPrefix)) {
+        if (columnName.toUpperCase(Locale.ENGLISH).startsWith(columnPrefix)) {
           propertyName = columnName.substring(columnPrefix.length());
         } else {
           continue;
@@ -913,7 +913,7 @@ private void createRowKeyForUnmappedProperties(ResultMap resultMap, ResultSetWra
       if (columnPrefix != null && columnPrefix.length() > 0) {
         // When columnPrefix is specified,
         // ignore columns without the prefix.
-        if (column.startsWith(columnPrefix)) {
+        if (column.toUpperCase(Locale.ENGLISH).startsWith(columnPrefix)) {
           property = column.substring(columnPrefix.length());
         } else {
           continue;

src/test/java/org/apache/ibatis/submitted/column_prefix/Brand.java

@@ -0,0 +1,51 @@
+/*
+ *    Copyright 2009-2013 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.column_prefix;
+
+import java.util.List;
+
+public class Brand {
+  private Integer id;
+
+  private String name;
+
+  private List<Product> products;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<Product> getProducts() {
+    return products;
+  }
+
+  public void setProducts(List<Product> products) {
+    this.products = products;
+  }
+}

src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java

@@ -16,9 +16,12 @@
 
 package org.apache.ibatis.submitted.column_prefix;
 
+import static org.junit.Assert.*;
+
 import java.util.List;
 
 import org.apache.ibatis.session.SqlSession;
+import org.junit.Test;
 
 public class ColumnPrefixAutoMappingTest extends ColumnPrefixTest {
   protected List<Pet> getPetAndRoom(SqlSession sqlSession) {
@@ -35,4 +38,18 @@ protected List<Person> getPersons(SqlSession sqlSession) {
   protected String getConfigPath() {
     return "org/apache/ibatis/submitted/column_prefix/ConfigAutoMapping.xml";
   }
+
+  @Test
+  public void testCaseInsensitivity() throws Exception {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Brand brand = sqlSession.selectOne("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectBrandWithProducts", 1);
+      assertEquals(Integer.valueOf(1), brand.getId());
+      assertEquals(2, brand.getProducts().size());
+      assertEquals(Integer.valueOf(10), brand.getProducts().get(0).getId());
+      assertEquals("alpha", brand.getProducts().get(0).getName());
+    } finally {
+      sqlSession.close();
+    }
+  }
 }

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

@@ -68,6 +68,20 @@ room_id int,
 room_name varchar(32)
 );
 
+drop table if exists brand;
+create table brand (
+id int,
+name varchar(32)
+);
+
+-- make columns case sensitive
+drop table if exists product;
+create table product (
+"product_id" int,
+"product_name" varchar(32),
+brand_id int
+);
+
 insert into room (room_id, room_name) values (31, 'Sakura');
 insert into room (room_id, room_name) values (32, 'Ume');
 insert into room (room_id, room_name) values (33, 'Tsubaki');
@@ -98,3 +112,8 @@ insert into address (id, state, city, phone1_id, phone2_id, addr_type, caution)
 insert into person (id, name, billing_address_id, shipping_address_id, room_id) values (1, 'John', 10, 11, 33);
 insert into person (id, name, billing_address_id, shipping_address_id, room_id) values (2, 'Rebecca', 12, null, null);
 insert into person (id, name, billing_address_id, shipping_address_id, room_id) values (3, 'Keith', null, 13, null);
+
+insert into brand (id, name) values (1, 'alpha');
+
+insert into product ("product_id", "product_name", brand_id) values (10, 'alpha', 1);
+insert into product ("product_id", "product_name", brand_id) values (20, 'beta', 1);

src/test/java/org/apache/ibatis/submitted/column_prefix/MapperAutoMapping.xml

@@ -158,4 +158,23 @@
     order by person.id, pet.id
   ]]></select>
 
+  <resultMap id="productMapper"
+    type="org.apache.ibatis.submitted.column_prefix.Product">
+    <id column="id" property="id" />
+  </resultMap>
+
+  <resultMap id="brandMapper"
+    type="org.apache.ibatis.submitted.column_prefix.Brand">
+    <id column="id" property="id" />
+    <collection property="products" resultMap="productMapper" columnPrefix="product_" />
+  </resultMap>
+
+  <select id="selectBrandWithProducts" resultMap="brandMapper">
+    select brand.id, brand.name, product."product_id" as "product_id", product."product_name"
+    from brand
+    left join product on product.brand_id = brand.id
+    where brand.id = #{id}
+    order by product."product_id"
+  </select>
+
 </mapper>

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

@@ -0,0 +1,39 @@
+/*
+ *    Copyright 2009-2013 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.column_prefix;
+
+public class Product {
+  private Integer id;
+
+  private String name;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}