fixes #18 When a Map is passed to foreach, ${index} is replaced with number instead of map key. This should also be the right fix for #10.

Author: harawata

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

@@ -70,7 +70,7 @@ public boolean apply(DynamicContext context) {
         applyIndex(context, mapEntry.getKey(), uniqueNumber);
         applyItem(context, mapEntry.getValue(), uniqueNumber);
       } else {
-        applyIndex(context, uniqueNumber, i);
+        applyIndex(context, i, uniqueNumber);
         applyItem(context, o, uniqueNumber);
       }
       contents.apply(new FilteredDynamicContext(configuration, context, index, item, uniqueNumber));
@@ -84,7 +84,7 @@ public boolean apply(DynamicContext context) {
 
   private void applyIndex(DynamicContext context, Object o, int i) {
     if (index != null) {
-      context.bind(index, i);
+      context.bind(index, o);
       context.bind(itemizeItem(index, i), o);
     }
   }

src/test/java/org/apache/ibatis/submitted/foreach_map/CreateDB.sql

@@ -39,3 +39,15 @@ create table nested_bean (
     valuea integer,
     valueb boolean
 );
+
+drop table key_cols if exists;
+
+create table key_cols (
+    id identity,
+    col_a integer,
+    col_b integer
+);
+
+insert into key_cols (id, col_a, col_b) values (1, 11, 222);
+insert into key_cols (id, col_a, col_b) values (2, 22, 222);
+insert into key_cols (id, col_a, col_b) values (3, 22, 333);

src/test/java/org/apache/ibatis/submitted/foreach_map/ForEachMapTest.java

@@ -15,16 +15,20 @@
  */
 package org.apache.ibatis.submitted.foreach_map;
 
+import java.io.Reader;
+import java.sql.Connection;
+import java.util.List;
+
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.junit.*;
-
-import java.io.Reader;
-import java.sql.Connection;
-import java.util.List;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class ForEachMapTest {
 
@@ -93,6 +97,15 @@ public void shouldGetNestedBeanKeyValueEntries() throws Exception {
     Assert.assertEquals(new NestedBeanMapEntry(12345, true, 54321, false), entries.get(0));
     Assert.assertEquals(new NestedBeanMapEntry(67890, true, 9876, false), entries.get(1));
   }
+  
+  @Test
+  public void shouldSubstituteIndexWithKey() throws Exception {
+    MapParam mapParam = new MapParam();
+    mapParam.getMap().put("col_a", 22);
+    mapParam.getMap().put("col_b", 222);
+    int count = sqlSession.selectOne("sel_key_cols", mapParam);
+    Assert.assertEquals(1, count);
+  }
 
   private SqlSession sqlSession;
 }

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

@@ -49,4 +49,11 @@
     <select id="sel_nested_bean" resultType="org.apache.ibatis.submitted.foreach_map.NestedBeanMapEntry">
 		select * from nested_bean order by id
 	</select>
+
+    <select id="sel_key_cols" resultType="int">
+        select count(*) from key_cols where
+        <foreach item="item" index="key" collection="map"
+            open="" separator="AND" close="">${key} = #{item}</foreach>
+    </select>
+
 </mapper>