Fix bug in performing IN queries with multiple values when IGNORECASE=TRUE

h2/src/main/org/h2/expression/Comparison.java

@@ -262,8 +262,7 @@ public class Comparison extends Condition {
      * @param l the first value
      * @param r the second value
      * @param compareType the compare type
-     * @return the result of the comparison (1 if the first value is bigger, -1
-     *         if smaller, 0 if both are equal)
+     * @return true if the comparison indicated by the comparison type evaluates to true
      */
     static boolean compareNotNull(Database database, Value l, Value r, int compareType) {
         boolean result;

h2/src/main/org/h2/expression/ConditionInConstantSet.java

@@ -7,7 +7,9 @@
 package org.h2.expression;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.Comparator;
+import java.util.TreeSet;
+import org.h2.engine.Database;
 import org.h2.engine.Session;
 import org.h2.index.IndexCondition;
 import org.h2.message.DbException;
@@ -30,7 +32,7 @@ public class ConditionInConstantSet extends Condition {
     private Expression left;
     private int queryLevel;
     private final ArrayList<Expression> valueList;
-    private final HashSet<Value> valueSet;
+    private final TreeSet<Value> valueSet;
 
     /**
      * Create a new IN(..) condition.
@@ -39,10 +41,15 @@ public class ConditionInConstantSet extends Condition {
      * @param left the expression before IN
      * @param valueList the value list (at least two elements)
      */
-    public ConditionInConstantSet(Session session, Expression left, ArrayList<Expression> valueList) {
+    public ConditionInConstantSet(final Session session, Expression left, ArrayList<Expression> valueList) {
         this.left = left;
         this.valueList = valueList;
-        this.valueSet = new HashSet<Value>(valueList.size());
+        this.valueSet = new TreeSet<Value>(new Comparator<Value>() {
+            @Override
+            public int compare(Value o1, Value o2) {
+                return session.getDatabase().compare(o1, o2);
+            }
+        });
         int type = left.getType();
         for (Expression expression : valueList) {
             valueSet.add(expression.getValue(session).convertTo(type));

h2/src/test/org/h2/test/db/TestOptimizations.java

@@ -54,7 +54,8 @@ public class TestOptimizations extends TestBase {
         testAutoAnalyze();
         testInAndBetween();
         testNestedIn();
-        testConstantIn();
+        testConstantIn1();
+        testConstantIn2();
         testNestedInSelectAndLike();
         testNestedInSelect();
         testInSelectJoin();
@@ -372,7 +373,7 @@ public class TestOptimizations extends TestBase {
         conn.close();
     }
 
-    private void testConstantIn() throws SQLException {
+    private void testConstantIn1() throws SQLException {
         deleteDb("optimizations");
         Connection conn = getConnection("optimizations");
         Statement stat = conn.createStatement();
@@ -387,6 +388,26 @@ public class TestOptimizations extends TestBase {
         conn.close();
     }
 
+    private void testConstantIn2() throws SQLException {
+        deleteDb("optimizations");
+        Connection conn = getConnection("optimizations;IGNORECASE=TRUE");
+        Statement stat = conn.createStatement();
+
+        stat.executeUpdate("CREATE TABLE testValues (x VARCHAR(50))");
+        stat.executeUpdate("INSERT INTO testValues (x) SELECT 'foo' x");
+        ResultSet resultSet;
+        resultSet = stat.executeQuery("SELECT x FROM testValues WHERE x IN ('foo')");
+        assertTrue(resultSet.next());
+        resultSet = stat.executeQuery("SELECT x FROM testValues WHERE x IN ('FOO')");
+        assertTrue(resultSet.next());
+        resultSet = stat.executeQuery("SELECT x FROM testValues WHERE x IN ('foo','bar')");
+        assertTrue(resultSet.next());
+        resultSet = stat.executeQuery("SELECT x FROM testValues WHERE x IN ('FOO','bar')");
+        assertTrue(resultSet.next());
+        
+        conn.close();
+    }
+    
     private void testNestedInSelect() throws SQLException {
         deleteDb("optimizations");
         Connection conn = getConnection("optimizations");