Added getMappedStatement(String, Boolean) in Configuration so that validation can be skipped by builders that use getMappedStatement() method.

Author: christianpoitras

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -489,7 +489,7 @@ private KeyGenerator handleSelectKeyAnnotation(SelectKey selectKeyAnnotation, St
 
     id = assistant.applyCurrentNamespace(id);
 
-    MappedStatement keyStatement = configuration.getMappedStatement(id);
+    MappedStatement keyStatement = configuration.getMappedStatement(id, false);
     SelectKeyGenerator answer = new SelectKeyGenerator(keyStatement, executeBefore); 
     configuration.addKeyGenerator(id, answer);
     return answer;

src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java

@@ -148,7 +148,7 @@ public void handleNode(XNode nodeToHandle, List<SqlNode> targetContents) {
 
       id = builderAssistant.applyCurrentNamespace(id);
 
-      MappedStatement keyStatement = configuration.getMappedStatement(id);
+      MappedStatement keyStatement = configuration.getMappedStatement(id, false);
       configuration.addKeyGenerator(id, new SelectKeyGenerator(keyStatement, executeBefore));
     }
   }

src/main/java/org/apache/ibatis/session/Configuration.java

@@ -400,7 +400,12 @@ public void addIncompleteCacheRef(CacheRefResolver incompleteCacheRef) {
   }
 
   public MappedStatement getMappedStatement(String id) {
-    buildAllStatements();
+	return this.getMappedStatement(id, true);
+  }
+  public MappedStatement getMappedStatement(String id, boolean validateIncompleteStatements) {
+	if (validateIncompleteStatements) {
+      buildAllStatements();
+	}
     return mappedStatements.get(id);
   }
 

src/test/java/org/apache/ibatis/submitted/xml_external_ref/InvalidWithInsertMapper.java

@@ -0,0 +1,8 @@
+package org.apache.ibatis.submitted.xml_external_ref;
+
+import java.util.Map;
+
+public interface InvalidWithInsertMapper {
+  Map<?, ?> selectAll();
+  void insert(Person person);
+}

src/test/java/org/apache/ibatis/submitted/xml_external_ref/InvalidWithInsertMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.apache.ibatis.submitted.xml_external_ref.InvalidWithInsertMapper">
+	<sql id="personColumnList">
+		person_id, person_name
+	</sql>
+	<select id="selectAll" resultType="java.util.Map">
+		SELECT
+		<include refid="wrongId" />
+		FROM person
+	</select>
+	
+	<insert id="insert" parameterType="java.util.Map">
+		INSERT INTO Person (person_name)
+		VALUES (#{name})
+		<selectKey>
+			SELECT IDENTITY()
+		</selectKey>
+	</insert>
+</mapper>

src/test/java/org/apache/ibatis/submitted/xml_external_ref/XmlExternalRefTest.java

@@ -44,6 +44,18 @@ public void testFailFastOnBuildAll() throws Exception {
     }
     configuration.getMappedStatementNames();
   }
+  
+  @Test(expected = BuilderException.class)
+  public void testFailFastOnBuildAllWithInsert() throws Exception {
+    Configuration configuration = new Configuration();
+    try {
+      configuration.addMapper(InvalidWithInsertMapper.class);
+      configuration.addMapper(InvalidMapper.class);
+    } catch (Exception e) {
+      fail("No exception should be thrown before parsing statement nodes.");
+    }
+    configuration.getMappedStatementNames();
+  }
 
   @Test
   public void testMappedStatementCache() throws Exception {