Fixes merge-columns should not be case sensitive.

http://transparensee.jira.com/browse/DATATOOL-31

Author: Eric Meyer

src/main/java/com/t11e/discovery/datatool/SqlAction.java

@@ -4,14 +4,17 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Required;
 
 import com.t11e.discovery.datatool.column.MergeColumns;
 
 public class SqlAction
+  implements InitializingBean
 {
   private Set<String> filter = Collections.singleton("any");
   private String action;
@@ -24,6 +27,20 @@ public class SqlAction
   private Set<String> jsonColumnNames = Collections.emptySet();
   private boolean useLowerCaseColumnNames = true;
 
+  @Override
+  public void afterPropertiesSet()
+    throws Exception
+  {
+    if (useLowerCaseColumnNames && mergeColumns != null)
+    {
+      for (final ListIterator<MergeColumns> it = mergeColumns.listIterator(); it.hasNext();)
+      {
+        final MergeColumns merge = it.next();
+        it.set(new MergeColumns(merge.getKeyColumn().toLowerCase(), merge.getValueColumn().toLowerCase()));
+      }
+    }
+  }
+
   public Set<String> getFilter()
   {
     return filter;

src/test/java/com/t11e/discovery/datatool/VerticalTableTest.xml

@@ -14,12 +14,12 @@
       <snapshot>
         <set-item idColumn="id">
           <query><![CDATA[
-            SELECT data.id, name, value
+            SELECT data.id, name as Name, value as Value
             FROM vertical_master_items master
             JOIN vertical_data data on data.id = master.id
             ORDER BY data.id, name, value
         ]]></query>
-          <merge-columns keyColumn="name" valueColumn="value"/>
+          <merge-columns keyColumn="Name" valueColumn="Value"/>
         </set-item>
         <remove-item idColumn="id">
           <query><![CDATA[