Clear 'item' and 'index' variables in the context at the end of foreach loop. Should fix #966 ( and #49 ).

Author: harawata

src/main/java/org/apache/ibatis/scripting/xmltags/ForEachSqlNode.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.
@@ -87,6 +87,8 @@ public boolean apply(DynamicContext context) {
       i++;
     }
     applyClose(context);
+    context.getBindings().remove(item);
+    context.getBindings().remove(index);
     return true;
   }
 

src/test/java/org/apache/ibatis/submitted/foreach/ForEachTest.java

@@ -143,4 +143,28 @@ public void shouldReportMissingPropertyName() {
     }
   }
 
+  @Test
+  public void shouldRemoveItemVariableInTheContext() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      int result = mapper.itemVariableConflict(5, Arrays.asList(1, 2), Arrays.asList(3, 4));
+      Assert.assertEquals(5, result);
+    } finally {
+      sqlSession.close();
+    }
+  }
+
+  @Test
+  public void shouldRemoveIndexVariableInTheContext() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      int result = mapper.indexVariableConflict(4, Arrays.asList(6, 7), Arrays.asList(8, 9));
+      Assert.assertEquals(4, result);
+    } finally {
+      sqlSession.close();
+    }
+  }
+
 }

src/test/java/org/apache/ibatis/submitted/foreach/Mapper.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.
@@ -17,6 +17,8 @@
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 public interface Mapper {
 
   User getUser(User user);
@@ -28,4 +30,8 @@ public interface Mapper {
   String selectWithNullItemCheck(List<User> users);
 
   int typoInItemProperty(List<User> users);
+
+  int itemVariableConflict(@Param("id") Integer id, @Param("ids") List<Integer> ids, @Param("ids2") List<Integer> ids2);
+
+  int indexVariableConflict(@Param("idx") Integer id, @Param("idxs") List<Integer> ids, @Param("idxs2") List<Integer> ids2);
 }

src/test/java/org/apache/ibatis/submitted/foreach/Mapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2016 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.
@@ -71,4 +71,25 @@
     </foreach>
   </insert>
 
+  <select id="itemVariableConflict" resultType="_int">
+    select count(*) from users where id in
+    <foreach collection="ids" item="id" open="(" close=")" separator=",">
+      <foreach collection="ids2" item="id">
+        #{id},
+      </foreach>
+      #{id}
+    </foreach>
+    or id = #{id}
+  </select>
+
+  <select id="indexVariableConflict" resultType="_int">
+    select count(*) from users where id in
+    <foreach collection="idxs" index="idx" open="(" close=")" separator=",">
+      <foreach collection="idxs2" index="idx">
+        #{idx},
+      </foreach>
+      #{idx} + 2
+    </foreach>
+    or id = #{idx}
+  </select>
 </mapper>