The optimization for IN(...) queries combined with OR could result in a strange…

The optimization for IN(...) queries combined with OR could result in a strange exception of the type "column x must be included in the group by list".

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

@@ -142,10 +142,12 @@ public class ConditionInConstantSet extends Condition {
     Expression getAdditional(Session session, Comparison other) {
         Expression add = other.getIfEquals(left);
         if (add != null) {
+            if (add.isConstant()) {
                 valueList.add(add);
                 valueSet.add(add.getValue(session).convertTo(left.getType()));
                 return this;
             }
+        }
         return null;
     }
 }

h2/src/test/org/h2/test/test-1.3.txt

 --- special grammar and test cases ---------------------------------------------------------------------------------------------
+select * from dual where x = x + 1 or x in(2, 0);
+> X
+> -
+> rows: 0
+
 select * from system_range(1,1) order by x limit 3 offset 3;
 > X
 > -