Related to #129.

Make sure that RAW language generates the same SQL than the XML
language.

Author: emacarron

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

@@ -82,14 +82,9 @@ public void parseStatementNode() {
     XMLIncludeTransformer includeParser = new XMLIncludeTransformer(configuration, builderAssistant);
     includeParser.applyIncludes(context.getNode());
 
-    // Parse selectKey after includes,
-    // in case if IncompleteElementException (issue #291)
-    List<XNode> selectKeyNodes = context.evalNodes("selectKey");
-    if (configuration.getDatabaseId() != null) {
-      parseSelectKeyNodes(id, selectKeyNodes, parameterTypeClass, langDriver, configuration.getDatabaseId());
-    }
-    parseSelectKeyNodes(id, selectKeyNodes, parameterTypeClass, langDriver, null);
-
+    // Parse selectKey after includes and remove them.
+    processSelectKeyNodes(id, parameterTypeClass, langDriver);
+    
     // Parse the SQL (pre: <selectKey> and <include> were parsed and removed)
     SqlSource sqlSource = langDriver.createSqlSource(configuration, context, parameterTypeClass);
     String resultSets = context.getStringAttribute("resultSets");
@@ -111,8 +106,17 @@ public void parseStatementNode() {
         resultSetTypeEnum, flushCache, useCache, resultOrdered, 
         keyGenerator, keyProperty, keyColumn, databaseId, langDriver, resultSets);
   }
-  
-  public void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> parameterTypeClass, LanguageDriver langDriver, String skRequiredDatabaseId) {
+
+  private void processSelectKeyNodes(String id, Class<?> parameterTypeClass, LanguageDriver langDriver) {
+    List<XNode> selectKeyNodes = context.evalNodes("selectKey");
+    if (configuration.getDatabaseId() != null) {
+      parseSelectKeyNodes(id, selectKeyNodes, parameterTypeClass, langDriver, configuration.getDatabaseId());
+    }
+    parseSelectKeyNodes(id, selectKeyNodes, parameterTypeClass, langDriver, null);
+    removeSelectKeyNodes(selectKeyNodes);
+  }
+
+  private void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> parameterTypeClass, LanguageDriver langDriver, String skRequiredDatabaseId) {
     for (XNode nodeToHandle : list) {
       String id = parentId + SelectKeyGenerator.SELECT_KEY_SUFFIX;
       String databaseId = nodeToHandle.getStringAttribute("databaseId");
@@ -122,7 +126,7 @@ public void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> para
     }
   }
 
-  public void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> parameterTypeClass, LanguageDriver langDriver, String databaseId) {
+  private void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> parameterTypeClass, LanguageDriver langDriver, String databaseId) {
     String resultType = nodeToHandle.getStringAttribute("resultType");
     Class<?> resultTypeClass = resolveClass(resultType);
     StatementType statementType = StatementType.valueOf(nodeToHandle.getStringAttribute("statementType", StatementType.PREPARED.toString()));
@@ -152,7 +156,12 @@ public void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> parameter
 
     MappedStatement keyStatement = configuration.getMappedStatement(id, false);
     configuration.addKeyGenerator(id, new SelectKeyGenerator(keyStatement, executeBefore));
-    nodeToHandle.getParent().getNode().removeChild(nodeToHandle.getNode());
+  }
+
+  private void removeSelectKeyNodes(List<XNode> selectKeyNodes) {
+    for (XNode nodeToHandle : selectKeyNodes) {
+      nodeToHandle.getParent().getNode().removeChild(nodeToHandle.getNode());
+    }
   }
 
   private boolean databaseIdMatchesCurrent(String id, String databaseId, String requiredDatabaseId) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 MyBatis.org.
+ * Copyright 2012-2014 MyBatis.org.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,58 @@
  */
 package org.apache.ibatis.scripting.defaults;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.ibatis.builder.BuilderException;
 import org.apache.ibatis.executor.parameter.ParameterHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.XNode;
 import org.apache.ibatis.scripting.LanguageDriver;
+import org.apache.ibatis.scripting.xmltags.MixedSqlNode;
+import org.apache.ibatis.scripting.xmltags.SqlNode;
+import org.apache.ibatis.scripting.xmltags.StaticTextSqlNode;
 import org.apache.ibatis.session.Configuration;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
+/**
+ * As of 3.2.4 the default XML language is able to identify static statements
+ * and create a {@link RawSqlSource}. So there is no need to use RAW unless you
+ * want to make sure that there is not any dynamic tag for any reason.
+ * 
+ * @since 3.2.0
+ */
 public class RawLanguageDriver implements LanguageDriver {
 
   public ParameterHandler createParameterHandler(MappedStatement mappedStatement, Object parameterObject, BoundSql boundSql) {
     return new DefaultParameterHandler(mappedStatement, parameterObject, boundSql);
   }
 
   public SqlSource createSqlSource(Configuration configuration, XNode script, Class<?> parameterType) {
-    return new RawSqlSource(configuration, script, parameterType);
+    return new RawSqlSource(configuration, parseXML(script), parameterType);
   }
 
   public SqlSource createSqlSource(Configuration configuration, String script, Class<?> parameterType) {
     return new RawSqlSource(configuration, script, parameterType);
   }
 
+  private static SqlNode parseXML(XNode script) {
+    List<SqlNode> contents = new ArrayList<SqlNode>();
+    NodeList children = script.getNode().getChildNodes();
+    for (int i = 0; i < children.getLength(); i++) {
+      XNode child = script.newXNode(children.item(i));
+      String nodeName = child.getNode().getNodeName();
+      if (child.getNode().getNodeType() == Node.CDATA_SECTION_NODE || child.getNode().getNodeType() == Node.TEXT_NODE) {
+        String data = child.getStringBody("");
+        contents.add(new StaticTextSqlNode(data));
+      } else if (child.getNode().getNodeType() == Node.ELEMENT_NODE) {
+        throw new BuilderException("Found an invalid element <" + nodeName + "> for RAW language.");
+      }
+    }
+    return new MixedSqlNode(contents);
+  }
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 MyBatis.org.
+ * Copyright 2012-2014 MyBatis.org.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,50 +20,36 @@
 import org.apache.ibatis.builder.SqlSourceBuilder;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.parsing.XNode;
 import org.apache.ibatis.scripting.xmltags.DynamicContext;
+import org.apache.ibatis.scripting.xmltags.DynamicSqlSource;
 import org.apache.ibatis.scripting.xmltags.SqlNode;
 import org.apache.ibatis.session.Configuration;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
+/**
+ * Static SqlSource. It is faster than {link {@link DynamicSqlSource} because mappings are 
+ * calculated during startup.
+ * 
+ * @since 3.2.0
+ */
 public class RawSqlSource implements SqlSource {
 
   private final SqlSource sqlSource;
-  
+
   public RawSqlSource(Configuration configuration, SqlNode rootSqlNode, Class<?> parameterType) {
     this(configuration, getSql(configuration, rootSqlNode), parameterType);
   }
 
-  public RawSqlSource(Configuration configuration, XNode script, Class<?> parameterType) {
-    this(configuration, getStringFromXNode(script), parameterType);
-  }
-  
   public RawSqlSource(Configuration configuration, String sql, Class<?> parameterType) {
     SqlSourceBuilder sqlSourceParser = new SqlSourceBuilder(configuration);
     Class<?> clazz = parameterType == null ? Object.class : parameterType;
     sqlSource = sqlSourceParser.parse(sql, clazz, new HashMap<String, Object>());
   }
-  
+
   private static String getSql(Configuration configuration, SqlNode rootSqlNode) {
     DynamicContext context = new DynamicContext(configuration, null);
     rootSqlNode.apply(context);
     return context.getSql();
   }
-  
-  private static String getStringFromXNode(XNode script) {
-    StringBuilder contents = new StringBuilder();
-    NodeList children = script.getNode().getChildNodes();
-    for (int i = 0; i < children.getLength(); i++) {
-      XNode child = script.newXNode(children.item(i));
-      if (child.getNode().getNodeType() == Node.CDATA_SECTION_NODE || child.getNode().getNodeType() == Node.TEXT_NODE) {
-        String data = child.getStringBody("");
-        contents.append(data);
-        contents.append(" "); // issue #128
-      }
-    }
-    return contents.toString();
-  }
 
   public BoundSql getBoundSql(Object parameterObject) {
     return sqlSource.getBoundSql(parameterObject);

src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2013 the original author or authors.
+ *    Copyright 2009-2014 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.
@@ -76,8 +76,7 @@ private List<SqlNode> parseDynamicTags(XNode node) {
     for (int i = 0; i < children.getLength(); i++) {
       XNode child = node.newXNode(children.item(i));
       String nodeName = child.getNode().getNodeName();
-      if (child.getNode().getNodeType() == Node.CDATA_SECTION_NODE
-          || child.getNode().getNodeType() == Node.TEXT_NODE) {
+      if (child.getNode().getNodeType() == Node.CDATA_SECTION_NODE || child.getNode().getNodeType() == Node.TEXT_NODE) {
         String data = child.getStringBody("");
         TextSqlNode textSqlNode = new TextSqlNode(data);
         if (textSqlNode.isDynamic()) {
@@ -86,7 +85,7 @@ private List<SqlNode> parseDynamicTags(XNode node) {
         } else {
           contents.add(new StaticTextSqlNode(data));
         }
-      } else if (child.getNode().getNodeType() == Node.ELEMENT_NODE && !"selectKey".equals(nodeName)) { // issue #628
+      } else if (child.getNode().getNodeType() == Node.ELEMENT_NODE) { // issue #628
         NodeHandler handler = nodeHandlers.get(nodeName);
         if (handler == null) {
           throw new BuilderException("Unknown element <" + nodeName + "> in SQL statement.");