Add some missing getSubexpression() implementations

h2/src/main/org/h2/command/dml/Query.java

@@ -19,7 +19,7 @@ import org.h2.expression.Alias;
 import org.h2.expression.Expression;
 import org.h2.expression.ExpressionColumn;
 import org.h2.expression.ExpressionVisitor;
-import org.h2.expression.Function;
+import org.h2.expression.FunctionCall;
 import org.h2.expression.Parameter;
 import org.h2.expression.ValueExpression;
 import org.h2.message.DbException;
@@ -555,8 +555,8 @@ public abstract class Query extends Prepared {
             }
         }
         int count = expr.getSubexpressionCount();
-        if (expr instanceof Function) {
-            if (!((Function) expr).isDeterministic()) {
+        if (expr instanceof FunctionCall) {
+            if (!((FunctionCall) expr).isDeterministic()) {
                 return false;
             }
         } else if (count <= 0) {

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

@@ -517,4 +517,26 @@ public class CompareLike extends Condition {
         return left.getCost() + right.getCost() + 3;
     }
 
+    @Override
+    public int getSubexpressionCount() {
+        return escape == null ? 2 : 3;
+    }
+
+    @Override
+    public Expression getSubexpression(int index) {
+        switch (index) {
+        case 0:
+            return left;
+        case 1:
+            return right;
+        case 2:
+            if (escape != null) {
+                return escape;
+            }
+            //$FALL-THROUGH$
+        default:
+            throw new IndexOutOfBoundsException();
+        }
+    }
+
 }

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

@@ -207,4 +207,20 @@ public class ConditionIn extends Condition {
         }
         return null;
     }
+
+    @Override
+    public int getSubexpressionCount() {
+        return 1 + valueList.size();
+    }
+
+    @Override
+    public Expression getSubexpression(int index) {
+        if (index == 0) {
+            return left;
+        } else if (index > 0 && index <= valueList.size()) {
+            return valueList.get(index - 1);
+        }
+        throw new IndexOutOfBoundsException();
+    }
+
 }

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

@@ -176,4 +176,20 @@ public class ConditionInConstantSet extends Condition {
         }
         return null;
     }
+
+    @Override
+    public int getSubexpressionCount() {
+        return 1 + valueList.size();
+    }
+
+    @Override
+    public Expression getSubexpression(int index) {
+        if (index == 0) {
+            return left;
+        } else if (index > 0 && index <= valueList.size()) {
+            return valueList.get(index - 1);
+        }
+        throw new IndexOutOfBoundsException();
+    }
+
 }

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

@@ -132,4 +132,14 @@ public class ExpressionList extends Expression {
         return expr;
     }
 
+    @Override
+    public int getSubexpressionCount() {
+        return list.length;
+    }
+
+    @Override
+    public Expression getSubexpression(int index) {
+        return list[index];
+    }
+
 }

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

@@ -312,22 +312,21 @@ public class IntervalOperation extends Expression {
         return left.getCost() + 1 + right.getCost();
     }
 
-    /**
-     * Get the left sub-expression of this operation.
-     *
-     * @return the left sub-expression
-     */
-    public Expression getLeftSubExpression() {
-        return left;
+    @Override
+    public int getSubexpressionCount() {
+        return 2;
     }
 
-    /**
-     * Get the right sub-expression of this operation.
-     *
-     * @return the right sub-expression
-     */
-    public Expression getRightSubExpression() {
+    @Override
+    public Expression getSubexpression(int index) {
+        switch (index) {
+        case 0:
+            return left;
+        case 1:
             return right;
+        default:
+            throw new IndexOutOfBoundsException();
+        }
     }
 
 }

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

@@ -178,4 +178,14 @@ public class JavaFunction extends Expression implements FunctionCall {
         return functionAlias.isBufferResultSetToLocalTemp();
     }
 
+    @Override
+    public int getSubexpressionCount() {
+        return args.length;
+    }
+
+    @Override
+    public Expression getSubexpression(int index) {
+        return args[index];
+    }
+
 }