Added better error reporting to help debug issues with mapper files

src/main/java/org/apache/ibatis/executor/result/ResultMapException.java

@@ -0,0 +1,40 @@
+/**
+ *    Copyright 2009-2015 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.executor.result;
+
+import org.apache.ibatis.exceptions.PersistenceException;
+
+/**
+ * @author Ryan Lamore
+ */
+public class ResultMapException extends PersistenceException {
+    private static final long serialVersionUID = 3270932060569707623L;
+
+    public ResultMapException() {
+    }
+
+    public ResultMapException(String message) {
+        super(message);
+    }
+
+    public ResultMapException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ResultMapException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -37,6 +37,7 @@
 import org.apache.ibatis.executor.parameter.ParameterHandler;
 import org.apache.ibatis.executor.result.DefaultResultContext;
 import org.apache.ibatis.executor.result.DefaultResultHandler;
+import org.apache.ibatis.executor.result.ResultMapException;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.Discriminator;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -562,21 +563,27 @@ private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, Lis
     throw new ExecutorException("Do not know how to create an instance of " + resultType);
   }
 
-  private Object createParameterizedResultObject(ResultSetWrapper rsw, Class<?> resultType, List<ResultMapping> constructorMappings,
-      List<Class<?>> constructorArgTypes, List<Object> constructorArgs, String columnPrefix) throws SQLException {
+  Object createParameterizedResultObject(ResultSetWrapper rsw, Class<?> resultType, List<ResultMapping> constructorMappings,
+      List<Class<?>> constructorArgTypes, List<Object> constructorArgs, String columnPrefix) {
     boolean foundValues = false;
     for (ResultMapping constructorMapping : constructorMappings) {
       final Class<?> parameterType = constructorMapping.getJavaType();
       final String column = constructorMapping.getColumn();
       final Object value;
-      if (constructorMapping.getNestedQueryId() != null) {
-        value = getNestedQueryConstructorValue(rsw.getResultSet(), constructorMapping, columnPrefix);
-      } else if (constructorMapping.getNestedResultMapId() != null) {
-        final ResultMap resultMap = configuration.getResultMap(constructorMapping.getNestedResultMapId());
-        value = getRowValue(rsw, resultMap);
-      } else {
-        final TypeHandler<?> typeHandler = constructorMapping.getTypeHandler();
-        value = typeHandler.getResult(rsw.getResultSet(), prependPrefix(column, columnPrefix));
+      try {
+        if (constructorMapping.getNestedQueryId() != null) {
+          value = getNestedQueryConstructorValue(rsw.getResultSet(), constructorMapping, columnPrefix);
+        } else if (constructorMapping.getNestedResultMapId() != null) {
+          final ResultMap resultMap = configuration.getResultMap(constructorMapping.getNestedResultMapId());
+          value = getRowValue(rsw, resultMap);
+        } else {
+          final TypeHandler<?> typeHandler = constructorMapping.getTypeHandler();
+          value = typeHandler.getResult(rsw.getResultSet(), prependPrefix(column, columnPrefix));
+        }
+      } catch (ResultMapException e) {
+        throw new ExecutorException("Could not process result for mapping: " + constructorMapping, e);
+      } catch (SQLException e) {
+        throw new ExecutorException("Could not process result for mapping: " + constructorMapping, e);
       }
       constructorArgTypes.add(parameterType);
       constructorArgs.add(value);

src/main/java/org/apache/ibatis/mapping/ParameterMapping.java

@@ -199,4 +199,20 @@ public String getExpression() {
     return expression;
   }
 
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("ParameterMapping{");
+    //sb.append("configuration=").append(configuration); // configuration doesn't have a useful .toString()
+    sb.append("property='").append(property).append('\'');
+    sb.append(", mode=").append(mode);
+    sb.append(", javaType=").append(javaType);
+    sb.append(", jdbcType=").append(jdbcType);
+    sb.append(", numericScale=").append(numericScale);
+    //sb.append(", typeHandler=").append(typeHandler); // typeHandler also doesn't have a useful .toString()
+    sb.append(", resultMapId='").append(resultMapId).append('\'');
+    sb.append(", jdbcTypeName='").append(jdbcTypeName).append('\'');
+    sb.append(", expression='").append(expression).append('\'');
+    sb.append('}');
+    return sb.toString();
+  }
 }

src/main/java/org/apache/ibatis/mapping/ResultMapping.java

@@ -280,4 +280,26 @@ public int hashCode() {
     }
   }
 
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("ResultMapping{");
+    //sb.append("configuration=").append(configuration); // configuration doesn't have a useful .toString()
+    sb.append("property='").append(property).append('\'');
+    sb.append(", column='").append(column).append('\'');
+    sb.append(", javaType=").append(javaType);
+    sb.append(", jdbcType=").append(jdbcType);
+    //sb.append(", typeHandler=").append(typeHandler); // typeHandler also doesn't have a useful .toString()
+    sb.append(", nestedResultMapId='").append(nestedResultMapId).append('\'');
+    sb.append(", nestedQueryId='").append(nestedQueryId).append('\'');
+    sb.append(", notNullColumns=").append(notNullColumns);
+    sb.append(", columnPrefix='").append(columnPrefix).append('\'');
+    sb.append(", flags=").append(flags);
+    sb.append(", composites=").append(composites);
+    sb.append(", resultSet='").append(resultSet).append('\'');
+    sb.append(", foreignColumn='").append(foreignColumn).append('\'');
+    sb.append(", lazy=").append(lazy);
+    sb.append('}');
+    return sb.toString();
+  }
+
 }

src/main/java/org/apache/ibatis/reflection/factory/DefaultObjectFactory.java

@@ -55,7 +55,7 @@ public void setProperties(Properties properties) {
     // no props for default
   }
 
-  private <T> T instantiateClass(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+  <T> T instantiateClass(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     try {
       Constructor<T> constructor;
       if (constructorArgTypes == null || constructorArgs == null) {
@@ -72,18 +72,20 @@ private <T> T instantiateClass(Class<T> type, List<Class<?>> constructorArgTypes
       return constructor.newInstance(constructorArgs.toArray(new Object[constructorArgs.size()]));
     } catch (Exception e) {
       StringBuilder argTypes = new StringBuilder();
-      if (constructorArgTypes != null) {
+      if (constructorArgTypes != null && !constructorArgTypes.isEmpty()) {
         for (Class<?> argType : constructorArgTypes) {
           argTypes.append(argType.getSimpleName());
           argTypes.append(",");
         }
+        argTypes.deleteCharAt(argTypes.length() - 1); // remove trailing ,
       }
       StringBuilder argValues = new StringBuilder();
-      if (constructorArgs != null) {
+      if (constructorArgs != null && !constructorArgs.isEmpty()) {
         for (Object argValue : constructorArgs) {
           argValues.append(String.valueOf(argValue));
           argValues.append(",");
         }
+        argValues.deleteCharAt(argValues.length() - 1); // remove trailing ,
       }
       throw new ReflectionException("Error instantiating " + type + " with invalid types (" + argTypes + ") or values (" + argValues + "). Cause: " + e, e);
     }

src/main/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandler.java

@@ -28,6 +28,7 @@
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeException;
 import org.apache.ibatis.type.TypeHandler;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 
@@ -58,7 +59,7 @@ public Object getParameterObject() {
   }
 
   @Override
-  public void setParameters(PreparedStatement ps) throws SQLException {
+  public void setParameters(PreparedStatement ps) {
     ErrorContext.instance().activity("setting parameters").object(mappedStatement.getParameterMap().getId());
     List<ParameterMapping> parameterMappings = boundSql.getParameterMappings();
     if (parameterMappings != null) {
@@ -82,7 +83,13 @@ public void setParameters(PreparedStatement ps) throws SQLException {
           if (value == null && jdbcType == null) {
             jdbcType = configuration.getJdbcTypeForNull();
           }
-          typeHandler.setParameter(ps, i + 1, value, jdbcType);
+          try {
+            typeHandler.setParameter(ps, i + 1, value, jdbcType);
+          } catch (TypeException e) {
+            throw new TypeException("Could not set parameters for mapping: " + parameterMapping + ". Cause: " + e, e);
+          } catch (SQLException e) {
+            throw new TypeException("Could not set parameters for mapping: " + parameterMapping + ". Cause: " + e, e);
+          }
         }
       }
     }

src/main/java/org/apache/ibatis/type/BaseTypeHandler.java

@@ -20,6 +20,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.ibatis.executor.result.ResultMapException;
 import org.apache.ibatis.session.Configuration;
 
 /**
@@ -48,13 +49,24 @@ public void setParameter(PreparedStatement ps, int i, T parameter, JdbcType jdbc
                 "Cause: " + e, e);
       }
     } else {
-      setNonNullParameter(ps, i, parameter, jdbcType);
+      try {
+        setNonNullParameter(ps, i, parameter, jdbcType);
+      } catch (Exception e) {
+        throw new TypeException("Error setting non null for parameter #" + i + " with JdbcType " + jdbcType + " . " +
+                "Try setting a different JdbcType for this parameter or a different configuration property. " +
+                "Cause: " + e, e);
+      }
     }
   }
 
   @Override
   public T getResult(ResultSet rs, String columnName) throws SQLException {
-    T result = getNullableResult(rs, columnName);
+    T result;
+    try {
+      result = getNullableResult(rs, columnName);
+    } catch (Exception e) {
+      throw new ResultMapException("Error attempting to get column '" + columnName + "' from result set.  Cause: " + e, e);
+    }
     if (rs.wasNull()) {
       return null;
     } else {
@@ -64,7 +76,12 @@ public T getResult(ResultSet rs, String columnName) throws SQLException {
 
   @Override
   public T getResult(ResultSet rs, int columnIndex) throws SQLException {
-    T result = getNullableResult(rs, columnIndex);
+    T result;
+    try {
+      result = getNullableResult(rs, columnIndex);
+    } catch (Exception e) {
+      throw new ResultMapException("Error attempting to get column #" + columnIndex+ " from result set.  Cause: " + e, e);
+    }
     if (rs.wasNull()) {
       return null;
     } else {
@@ -74,7 +91,12 @@ public T getResult(ResultSet rs, int columnIndex) throws SQLException {
 
   @Override
   public T getResult(CallableStatement cs, int columnIndex) throws SQLException {
-    T result = getNullableResult(cs, columnIndex);
+    T result;
+    try {
+      result = getNullableResult(cs, columnIndex);
+    } catch (Exception e) {
+      throw new ResultMapException("Error attempting to get column #" + columnIndex+ " from callable statement.  Cause: " + e, e);
+    }
     if (cs.wasNull()) {
       return null;
     } else {

src/test/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandlerTest.java

@@ -16,20 +16,20 @@
 package org.apache.ibatis.executor.resultset;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.Statement;
-import java.sql.Types;
+import java.sql.*;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
 import org.apache.ibatis.builder.StaticSqlSource;
 import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
 import org.apache.ibatis.executor.parameter.ParameterHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -39,7 +39,9 @@
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.type.TypeHandler;
 import org.apache.ibatis.type.TypeHandlerRegistry;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -67,18 +69,7 @@ public class DefaultResultSetHandlerTest {
   @Test
   public void shouldRetainColumnNameCase() throws Exception {
 
-    final Configuration config = new Configuration();
-    final TypeHandlerRegistry registry = config.getTypeHandlerRegistry();
-    final MappedStatement ms = new MappedStatement.Builder(config, "testSelect", new StaticSqlSource(config, "some select statement"), SqlCommandType.SELECT).resultMaps(
-        new ArrayList<ResultMap>() {
-          {
-            add(new ResultMap.Builder(config, "testMap", HashMap.class, new ArrayList<ResultMapping>() {
-              {
-                add(new ResultMapping.Builder(config, "cOlUmN1", "CoLuMn1", registry.getTypeHandler(Integer.class)).build());
-              }
-            }).build());
-          }
-        }).build();
+    final MappedStatement ms = getMappedStatement();
 
     final Executor executor = null;
     final ParameterHandler parameterHandler = null;
@@ -106,4 +97,45 @@ public void shouldRetainColumnNameCase() throws Exception {
     assertEquals(Integer.valueOf(100), ((HashMap) results.get(0)).get("cOlUmN1"));
   }
 
+  @Test
+  public void shouldThrowExceptionWithColumnName() throws Exception {
+    final MappedStatement ms = getMappedStatement();
+    final RowBounds rowBounds = new RowBounds(0, 100);
+
+    final DefaultResultSetHandler defaultResultSetHandler = new DefaultResultSetHandler(null/*executor*/, ms,
+            null/*parameterHandler*/, null/*resultHandler*/, null/*boundSql*/, rowBounds);
+
+    final ResultSetWrapper rsw = mock(ResultSetWrapper.class);
+
+    final ResultMapping resultMapping = mock(ResultMapping.class);
+    final TypeHandler typeHandler = mock(TypeHandler.class);
+    when(resultMapping.getTypeHandler()).thenReturn(typeHandler);
+    when(typeHandler.getResult(any(ResultSet.class), anyString())).thenThrow(new SQLException("exception"));
+    List<ResultMapping> constructorMappings = Collections.singletonList(resultMapping);
+
+    try {
+      defaultResultSetHandler.createParameterizedResultObject(rsw, null/*resultType*/, constructorMappings,
+              null/*constructorArgTypes*/, null/*constructorArgs*/, null/*columnPrefix*/);
+      Assert.fail("Should have thrown ExecutorException");
+    } catch (Exception e) {
+      Assert.assertTrue("Expected ExecutorException", e instanceof ExecutorException);
+      Assert.assertTrue("", e.getMessage().contains("mapping: " + resultMapping.toString()));
+    }
+  }
+
+  MappedStatement getMappedStatement() {
+    final Configuration config = new Configuration();
+    final TypeHandlerRegistry registry = config.getTypeHandlerRegistry();
+    return new MappedStatement.Builder(config, "testSelect", new StaticSqlSource(config, "some select statement"), SqlCommandType.SELECT).resultMaps(
+        new ArrayList<ResultMap>() {
+          {
+            add(new ResultMap.Builder(config, "testMap", HashMap.class, new ArrayList<ResultMapping>() {
+              {
+                add(new ResultMapping.Builder(config, "cOlUmN1", "CoLuMn1", registry.getTypeHandler(Integer.class)).build());
+              }
+            }).build());
+          }
+        }).build();
+  }
+
 }