Detect row values in getExpressionColumns()

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

@@ -15,7 +15,7 @@ import org.h2.table.ColumnResolver;
 import org.h2.table.TableFilter;
 import org.h2.value.TypeInfo;
 import org.h2.value.Value;
-import org.h2.value.ValueArray;
+import org.h2.value.ValueCollectionBase;
 
 /**
  * An expression is a operation, a value, or a function in a query.
@@ -370,7 +370,7 @@ public abstract class Expression {
      * @param value the value to extract columns from
      * @return array of expression columns
      */
-    protected static Expression[] getExpressionColumns(Session session, ValueArray value) {
+    protected static Expression[] getExpressionColumns(Session session, ValueCollectionBase value) {
         Value[] list = value.getList();
         ExpressionColumn[] expr = new ExpressionColumn[list.length];
         for (int i = 0, len = list.length; i < len; i++) {

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

@@ -13,8 +13,8 @@ import org.h2.table.ColumnResolver;
 import org.h2.table.TableFilter;
 import org.h2.value.TypeInfo;
 import org.h2.value.Value;
-import org.h2.value.ValueArray;
 import org.h2.value.ValueBoolean;
+import org.h2.value.ValueCollectionBase;
 import org.h2.value.ValueNull;
 
 /**
@@ -163,8 +163,9 @@ public class ValueExpression extends Expression {
 
     @Override
     public Expression[] getExpressionColumns(Session session) {
-        if (getType().getValueType() == Value.ARRAY) {
-            return getExpressionColumns(session, (ValueArray) getValue(session));
+        int valueType = getType().getValueType();
+        if (valueType == Value.ARRAY || valueType == Value.ROW) {
+            return getExpressionColumns(session, (ValueCollectionBase) getValue(session));
         }
         return super.getExpressionColumns(session);
     }

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

@@ -161,6 +161,7 @@ public class JavaFunction extends Expression implements FunctionCall {
             ValueResultSet rs = getValueForColumnList(session, getArgs());
             return getExpressionColumns(session, rs.getResult());
         case Value.ARRAY:
+        case Value.ROW:
             return getExpressionColumns(session, (ValueArray) getValue(session));
         }
         return super.getExpressionColumns(session);