Fixes #65 Property reference breaks when its name partly matches with 'item' or 'index' variable.

Author: harawata

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

@@ -145,9 +145,9 @@ public String getSql() {
     public void appendSql(String sql) {
       GenericTokenParser parser = new GenericTokenParser("#{", "}", new TokenHandler() {
         public String handleToken(String content) {
-          String newContent = content.replaceFirst(item, itemizeItem(item, index));
+          String newContent = content.replaceFirst("^\\s*" + item + "(?![^.,:\\s])", itemizeItem(item, index));
           if (itemIndex != null && newContent.equals(content)) {
-            newContent = content.replaceFirst(itemIndex, itemizeItem(itemIndex, index));
+            newContent = content.replaceFirst("^\\s*" + itemIndex + "(?![^.,:\\s])", itemizeItem(itemIndex, index));
           }
           return new StringBuilder("#{").append(newContent).append("}").toString();
         }

src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java

@@ -23,6 +23,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
@@ -289,6 +291,28 @@ public void shouldIterateOnceForEachItemInCollection() throws Exception {
     assertEquals("__frch_item_2", boundSql.getParameterMappings().get(2).getProperty());
   }
 
+  @Test
+  public void shouldPerformStrictMatchOnForEachVariableSubstitution() throws Exception {
+    final Map<String, Object> param = new HashMap<String, Object>();
+    final Map<String, String> uuu = new HashMap<String, String>();
+    uuu.put("u", "xyz");
+    List<Bean> uuuu = new ArrayList<Bean>();
+    uuuu.add(new Bean("bean id"));
+    param.put("uuu", uuu);
+    param.put("uuuu", uuuu);
+    DynamicSqlSource source = createDynamicSqlSource(
+        new TextSqlNode("INSERT INTO BLOG (ID, NAME, NOTE, COMMENT) VALUES"),
+        new ForEachSqlNode(new Configuration(),mixedContents(
+            new TextSqlNode("#{uuu.u}, #{u.id}, #{ u,typeHandler=org.apache.ibatis.type.StringTypeHandler},"
+                + " #{u:VARCHAR,typeHandler=org.apache.ibatis.type.StringTypeHandler}")), "uuuu", "uu", "u", "(", ")", ","));
+    BoundSql boundSql = source.getBoundSql(param);
+    assertEquals(4, boundSql.getParameterMappings().size());
+    assertEquals("uuu.u", boundSql.getParameterMappings().get(0).getProperty());
+    assertEquals("__frch_u_0.id", boundSql.getParameterMappings().get(1).getProperty());
+    assertEquals("__frch_u_0", boundSql.getParameterMappings().get(2).getProperty());
+    assertEquals("__frch_u_0", boundSql.getParameterMappings().get(3).getProperty());
+  }
+
   private DynamicSqlSource createDynamicSqlSource(SqlNode... contents) throws IOException, SQLException {
     createBlogDataSource();
     final String resource = "org/apache/ibatis/builder/MapperConfig.xml";