Fixes #9. A column mapped to an unknown object type should produce an

exception.

Author: emacarron

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

@@ -305,31 +305,36 @@ protected boolean applyPropertyMappings(ResultSet rs, ResultMap resultMap, List<
       if (propertyMapping.isCompositeResult() || (column != null && mappedColumnNames.contains(column.toUpperCase(Locale.ENGLISH)))) {
         Object value = getPropertyMappingValue(rs, metaObject, propertyMapping, lazyLoader, columnPrefix);
         final String property = propertyMapping.getProperty(); // issue #541 make property optional
-        if (value != OMIT && property != null && (value != null || isCallSettersOnNulls(metaObject.getGetterType(property)))) { // issue #377, call setter on nulls          
+        if (value != OMIT && property != null && (value != null || isCallSettersOnNulls(metaObject.getSetterType(property)))) { // issue #377, call setter on nulls          
             metaObject.setValue(property, value);
-            foundValues = true;
+            foundValues = (value != null) || foundValues;
         }
       }
     }
     return foundValues;
   }
-  
-  private  boolean isCallSettersOnNulls(Class<?> propertyType){
-      if(configuration.isCallSettersOnNulls() && !propertyType.isPrimitive()){
-          return true;
-      }
-      return false;
+
+  protected boolean isCallSettersOnNulls(Class<?> propertyType) {
+    return (configuration.isCallSettersOnNulls() && !propertyType.isPrimitive());
   }
-  
+
   protected Object getPropertyMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping, ResultLoaderMap lazyLoader, String columnPrefix) throws SQLException {
-    final TypeHandler<?> typeHandler = propertyMapping.getTypeHandler();
     if (propertyMapping.getNestedQueryId() != null) {
       return getNestedQueryMappingValue(rs, metaResultObject, propertyMapping, lazyLoader, columnPrefix);
-    } else if (typeHandler != null) {
+    } else if (propertyMapping.getNestedResultMapId() != null) {
+      // the user added a column attribute to a nested result map, ignore it
+      return OMIT;
+    } else {
+      final TypeHandler<?> typeHandler = propertyMapping.getTypeHandler();
+      if (typeHandler == null) { // issue #9
+        throw new ExecutorException("Unknown type " + propertyMapping.getJavaType() 
+            + " in mapping property=" + propertyMapping.getProperty()
+            + " column=" +  propertyMapping.getColumn()
+            + ". You need to register a TypeHandler for this type for MyBatis to correctly convert the result.");
+      }
       final String column = prependPrefix(propertyMapping.getColumn(), columnPrefix);
       return typeHandler.getResult(rs, column);
     }
-    return OMIT;
   }
 
   protected boolean applyAutomaticMappings(ResultSet rs, List<String> unmappedColumnNames, MetaObject metaObject, String columnPrefix, ResultColumnCache resultColumnCache) throws SQLException {
@@ -353,7 +358,7 @@ protected boolean applyAutomaticMappings(ResultSet rs, List<String> unmappedColu
           final Object value = typeHandler.getResult(rs, columnName);
           if (value != null || isCallSettersOnNulls(propertyType)) { // issue #377, call setter on nulls
             metaObject.setValue(property, value);
-            foundValues = true;
+            foundValues = (value != null) || foundValues;
           }
         }
       }

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

@@ -0,0 +1,25 @@
+--
+--    Copyright 2009-2012 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.
+--    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.
+--
+
+drop table users if exists;
+
+create table users (
+  id int,
+  name varchar(20),
+  unknownObject varchar(20)
+);
+
+insert into users (id, name, unknownObject) values(1, 'User1', 'unknownObject');

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

@@ -0,0 +1,22 @@
+/*
+ *    Copyright 2009-2012 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.
+ *    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.unknownobject;
+
+public interface Mapper {
+
+  User getUser(Integer id);
+
+}

src/test/java/org/apache/ibatis/submitted/unknownobject/Mapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+       Copyright 2009-2012 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.
+       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.
+-->
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.unknownobject.Mapper">
+
+	<select id="getUser" resultMap="map">
+		select * from users
+	</select>
+	
+	<resultMap type="org.apache.ibatis.submitted.unknownobject.User" id="map" autoMapping="false">
+		<result column="id" property="id" />
+		<result column="name" property="name" />
+		<result column="unknownObject" property="unknownObject" />
+	</resultMap>
+
+</mapper>

src/test/java/org/apache/ibatis/submitted/unknownobject/UnknownObject.java

@@ -0,0 +1,5 @@
+package org.apache.ibatis.submitted.unknownobject;
+
+public class UnknownObject {
+
+}

src/test/java/org/apache/ibatis/submitted/unknownobject/UnknownObjectTest.java

@@ -0,0 +1,65 @@
+/*
+ *    Copyright 2009-2012 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.
+ *    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.unknownobject;
+
+import java.io.Reader;
+import java.sql.Connection;
+
+import org.apache.ibatis.exceptions.PersistenceException;
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class UnknownObjectTest {
+
+  private static SqlSessionFactory sqlSessionFactory;
+
+  @BeforeClass
+  public static void setUp() throws Exception {
+    // create a SqlSessionFactory
+    Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/unknownobject/mybatis-config.xml");
+    sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    reader.close();
+
+    // populate in-memory database
+    SqlSession session = sqlSessionFactory.openSession();
+    Connection conn = session.getConnection();
+    reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/unknownobject/CreateDB.sql");
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setLogWriter(null);
+    runner.runScript(reader);
+    reader.close();
+    session.close();
+  }
+
+  @Test(expected=PersistenceException.class)
+  public void shouldGetAUser() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      User user = mapper.getUser(1);
+      Assert.assertEquals("User1", user.getName());
+    } finally {
+      sqlSession.close();
+    }
+  }
+
+}

src/test/java/org/apache/ibatis/submitted/unknownobject/User.java

@@ -0,0 +1,47 @@
+/*
+ *    Copyright 2009-2012 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.
+ *    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.unknownobject;
+
+public class User {
+
+  private Integer id;
+  private String name;
+  private UnknownObject unknownObject;
+
+  public UnknownObject getUnknownObject() {
+    return unknownObject;
+  }
+
+  public void setUnknownObject(UnknownObject unknownObject) {
+    this.unknownObject = unknownObject;
+  }
+
+  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;
+  }
+}

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+       Copyright 2009-2012 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.
+       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.
+-->
+<!DOCTYPE configuration
+    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+
+	<environments default="development">
+		<environment id="development">
+			<transactionManager type="JDBC">
+				<property name="" value="" />
+			</transactionManager>
+			<dataSource type="UNPOOLED">
+				<property name="driver" value="org.hsqldb.jdbcDriver" />
+				<property name="url" value="jdbc:hsqldb:mem:unknownobject" />
+				<property name="username" value="sa" />
+			</dataSource>
+		</environment>
+	</environments>
+
+	<mappers>
+		<mapper resource="org/apache/ibatis/submitted/unknownobject/Mapper.xml" />
+	</mappers>
+
+</configuration>