Support child nodes on bind element

src/main/java/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd

@@ -243,10 +243,10 @@ lang CDATA #IMPLIED
 refid CDATA #REQUIRED
 >
 
-<!ELEMENT bind EMPTY>
+<!ELEMENT bind (#PCDATA | include | trim | where | set | foreach | choose | if | bind)*>
 <!ATTLIST bind
  name CDATA #REQUIRED
- value CDATA #REQUIRED
+ value CDATA #IMPLIED
 >
 
 <!ELEMENT sql (#PCDATA | include | trim | where | set | foreach | choose | if | bind)*>

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 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.
@@ -53,6 +53,13 @@ public DynamicContext(Configuration configuration, Object parameterObject) {
     bindings.put(DATABASE_ID_KEY, configuration.getDatabaseId());
   }
 
+  /**
+   * @since 3.4.5
+   */
+  public DynamicContext(DynamicContext source) {
+    this.bindings = source.bindings;
+  }
+
   public Map<String, Object> getBindings() {
     return bindings;
   }

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

@@ -0,0 +1,40 @@
+/**
+ *    Copyright 2009-2017 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.scripting.xmltags;
+
+/**
+ * @author Kazuki Shimizu
+ * @since 3.4.5
+ */
+public class VarBindSqlNode implements SqlNode {
+
+  private final String name;
+  private final SqlNode contents;
+
+  public VarBindSqlNode(String name, SqlNode contents) {
+    this.name = name;
+    this.contents = contents;
+  }
+
+  @Override
+  public boolean apply(DynamicContext context) {
+    DynamicContext subContext = new DynamicContext(context);
+    contents.apply(subContext);
+    context.bind(name, subContext.getSql());
+    return true;
+  }
+
+}

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

@@ -24,6 +24,7 @@
 import org.apache.ibatis.builder.BuilderException;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.XNode;
+import org.apache.ibatis.scripting.ScriptingException;
 import org.apache.ibatis.scripting.defaults.RawSqlSource;
 import org.apache.ibatis.session.Configuration;
 import org.w3c.dom.Node;
@@ -114,7 +115,17 @@ public BindHandler() {
     public void handleNode(XNode nodeToHandle, List<SqlNode> targetContents) {
       final String name = nodeToHandle.getStringAttribute("name");
       final String expression = nodeToHandle.getStringAttribute("value");
-      final VarDeclSqlNode node = new VarDeclSqlNode(name, expression);
+      if (expression != null && nodeToHandle.getNode().getChildNodes().getLength() > 0) {
+        throw new ScriptingException("Not support to specify value attribute and body with together on bind element.");
+      }
+      final SqlNode node;
+      if (expression != null) {
+        node = new VarDeclSqlNode(name, expression);
+      } else {
+        final List<SqlNode> contents = parseDynamicTags(nodeToHandle);
+        final MixedSqlNode mixedSqlNode = new MixedSqlNode(contents);
+        node = new VarBindSqlNode(name, mixedSqlNode);
+      }
       targetContents.add(node);
     }
   }

src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 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.
@@ -19,4 +19,6 @@
 
 public interface DynSqlMapper {
   String selectDescription(@Param("p") String p);
+
+  String selectDescriptionById(@Param("id") Integer id);
 }

src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2015 the original author or authors.
+       Copyright 2009-2017 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.
@@ -30,4 +30,25 @@
       WHERE id = 3
     </if>
   </select>
+  <select id="selectDescriptionById" resultType="string">
+    <bind name="conditions">
+      WHERE 1 = 1
+      <if test="id != null">
+        AND id = #{id}
+      </if>
+      <bind name="zero" value="0"/>
+      <bind name="innerCondition">
+        AND id > #{zero}
+      </bind>
+      ${innerCondition}
+    </bind>
+    <include refid="selectDescriptionByConditions">
+      <property name="where" value="${conditions}"/>
+    </include>
+  </select>
+  <sql id="selectDescriptionByConditions">
+    SELECT description
+    FROM ibtest.names
+    ${where}
+  </sql>
 </mapper>

src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 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.
@@ -15,17 +15,23 @@
  */
 package org.apache.ibatis.submitted.dynsql;
 
+import static com.googlecode.catchexception.apis.BDDCatchException.*;
+import static org.assertj.core.api.BDDAssertions.then;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 
+import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.scripting.ScriptingException;
+import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -170,4 +176,25 @@ public void testBindNull() {
     }
   }
 
+  @Test
+  public void testBindDynaSubNode() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      DynSqlMapper mapper = sqlSession.getMapper(DynSqlMapper.class);
+      String description = mapper.selectDescriptionById(3);
+      assertEquals("Pebbles", description);
+    } finally {
+      sqlSession.close();
+    }
+  }
+
+  @Test
+  public void testInvalidBind() throws IOException {
+    Configuration configuration = new Configuration();
+    when(configuration).addMapper(InvalidBindSqlMapper.class);
+    then(caughtException()).isInstanceOf(PersistenceException.class)
+      .hasCauseInstanceOf(ScriptingException.class)
+      .hasMessageContaining("Not support to specify value attribute and body with together on bind element.");
+  }
+
 }

src/test/java/org/apache/ibatis/submitted/dynsql/InvalidBindSqlMapper.java

@@ -0,0 +1,20 @@
+/**
+ *    Copyright 2009-2017 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.submitted.dynsql;
+
+public interface InvalidBindSqlMapper {
+  String invalidBind();
+}

src/test/java/org/apache/ibatis/submitted/dynsql/InvalidBindSqlMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+       Copyright 2009-2017 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.
+
+-->
+
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.dynsql.InvalidBindSqlMapper">
+  <select id="invalidBind">
+    <bind name="conditions" value="'WHERE 2 = 2'">
+      WHERE 1 = 1
+    </bind>
+  </select>
+</mapper>