(fixes http://code.google.com/p/mybatis/issues/detail?id=291 ) Parse selectKey after other nodes, in case another node throws IncompleteElementException.

Author: harawata

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

@@ -86,6 +86,9 @@ public void parseStatementNode() {
     ResultSetType resultSetTypeEnum = resolveResultSetType(resultSetType);
 
     List<SqlNode> contents = parseDynamicTags(context);
+    // Parse selectKey after other nodes,
+    // in case another node throws IncompleteElementException (issue #291)
+    parseSelectKey(context);
     MixedSqlNode rootSqlNode = new MixedSqlNode(contents);
     SqlSource sqlSource = new DynamicSqlSource(configuration, rootSqlNode);
     String nodeName = context.getNode().getNodeName();
@@ -132,7 +135,7 @@ private boolean databaseIdMatchesCurrent(String id, String databaseId) {
     }
     return true;
   }
-
+  
   private List<SqlNode> parseDynamicTags(XNode node) {
     List<SqlNode> contents = new ArrayList<SqlNode>();
     NodeList children = node.getNode().getChildNodes();
@@ -143,18 +146,29 @@ private List<SqlNode> parseDynamicTags(XNode node) {
           || child.getNode().getNodeType() == Node.TEXT_NODE) {
         String data = child.getStringBody("");
         contents.add(new TextSqlNode(data));
-      } else {
+      } else if (!"selectKey".equals(nodeName)) {
         NodeHandler handler = nodeHandlers.get(nodeName);
         if (handler == null) {
           throw new BuilderException("Unknown element <" + nodeName + "> in SQL statement.");
         }
         handler.handleNode(child, contents);
-
       }
     }
     return contents;
   }
 
+  private void parseSelectKey(XNode node) {
+    NodeList children = node.getNode().getChildNodes();
+    for (int i = 0; i < children.getLength(); i++) {
+      XNode child = node.newXNode(children.item(i));
+      String nodeName = child.getNode().getNodeName();
+      if ("selectKey".equals(nodeName)) {
+        NodeHandler handler = nodeHandlers.get(nodeName);
+        handler.handleNode(child, null);
+      }
+    }
+  }
+
   private Map<String, NodeHandler> nodeHandlers = new HashMap<String, NodeHandler>() {
     private static final long serialVersionUID = 7123056019193266281L;
 

src/test/java/org/apache/ibatis/submitted/refid_resolution/ExternalMapper1.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 mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.refid_resolution.ExternalMapper1">
+	<select id="select" resultType="map">
+		select
+		<include
+			refid="org.apache.ibatis.submitted.refid_resolution.ExternalMapper2.externalColumnList" />
+		from table1
+	</select>
+	<insert id="insert" parameterType="map">
+		<selectKey resultType="java.lang.Integer" keyProperty="id">
+			CALL IDENTITY()
+		</selectKey>
+		insert into table1 (
+		<include
+			refid="org.apache.ibatis.submitted.refid_resolution.ExternalMapper2.externalColumnList" />
+		) values (#{field1},#{field2})
+	</insert>
+</mapper>

src/test/java/org/apache/ibatis/submitted/refid_resolution/ExternalMapper2.xml

@@ -0,0 +1,28 @@
+<?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.refid_resolution.ExternalMapper2">
+	<sql id="externalColumnList">
+		field1, field2
+	</sql>
+</mapper>

src/test/java/org/apache/ibatis/submitted/refid_resolution/ExternalMapperConfig.xml

@@ -0,0 +1,31 @@
+<?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>
+
+	<mappers>
+		<mapper resource="org/apache/ibatis/submitted/refid_resolution/ExternalMapper1.xml" />
+		<mapper resource="org/apache/ibatis/submitted/refid_resolution/ExternalMapper2.xml" />
+	</mappers>
+
+</configuration>

src/test/java/org/apache/ibatis/submitted/refid_resolution/ExternalRefidResolutionTest.java

@@ -0,0 +1,38 @@
+/*
+ *    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.refid_resolution;
+
+import java.io.Reader;
+
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.junit.Test;
+
+/**
+ * @see http://code.google.com/p/mybatis/issues/detail?id=291
+ */
+public class ExternalRefidResolutionTest {
+  @Test
+  public void testExternalRefAfterSelectKey() throws Exception {
+    String resource = "org/apache/ibatis/submitted/refid_resolution/ExternalMapperConfig.xml";
+    Reader reader = Resources.getResourceAsReader(resource);
+    SqlSessionFactoryBuilder builder = new SqlSessionFactoryBuilder();
+    SqlSessionFactory sqlSessionFactory = builder.build(reader);
+    reader.close();
+    sqlSessionFactory.getConfiguration().getMappedStatementNames();
+  }
+}