ROWNUM() did not work in combination with IN(..). The following query did not…

ROWNUM() did not work in combination with IN(..). The following query did not work as expected: select * from (select rownum r from test) where r in (1, 2).

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

@@ -1137,7 +1137,8 @@ public class Select extends Query {
         if (col.isEverything(ExpressionVisitor.QUERY_COMPARABLE_VISITOR)) {
             comp = new Comparison(session, comparisonType, col, param);
         } else {
-            // add the parameters, so they can be set later
+            // this condition will always evaluate to true, but need to
+            // add the parameter, so it can be set later
             comp = new Comparison(session, Comparison.EQUAL_NULL_SAFE, param, param);
         }
         comp = comp.optimize(session);

h2/src/main/org/h2/index/ViewCursor.java

@@ -19,13 +19,18 @@ import org.h2.value.ValueNull;
  */
 public class ViewCursor implements Cursor {
 
-    private Table table;
-    private ResultInterface result;
+    private final Table table;
+    private final Index index;
+    private final ResultInterface result;
+    private final SearchRow first, last;
     private Row current;
 
-    ViewCursor(Table table, ResultInterface result) {
-        this.table = table;
+    ViewCursor(Index index, ResultInterface result, SearchRow first, SearchRow last) {
+        this.table = index.getTable();
+        this.index = index;
         this.result = result;
+        this.first = first;
+        this.last = last;
     }
 
     public Row get() {
@@ -37,19 +42,34 @@ public class ViewCursor implements Cursor {
     }
 
     public boolean next() {
-        boolean res = result.next();
-        if (!res) {
-            result.close();
-            current = null;
-            return false;
+        while (true) {
+            boolean res = result.next();
+            if (!res) {
+                result.close();
+                current = null;
+                return false;
+            }
+            current = table.getTemplateRow();
+            Value[] values = result.currentRow();
+            for (int i = 0, len = current.getColumnCount(); i < len; i++) {
+                Value v = i < values.length ? values[i] : ValueNull.INSTANCE;
+                current.setValue(i, v);
+            }
+            int comp;
+            if (first != null) {
+                comp = index.compareRows(current, first);
+                if (comp < 0) {
+                    continue;
+                }
+            }
+            if (last != null) {
+                comp = index.compareRows(current, last);
+                if (comp > 0) {
+                    continue;
+                }
+            }
+            return true;
         }
-        current = table.getTemplateRow();
-        Value[] values = result.currentRow();
-        for (int i = 0, len = current.getColumnCount(); i < len; i++) {
-            Value v = i < values.length ? values[i] : ValueNull.INSTANCE;
-            current.setValue(i, v);
-        }
-        return true;
     }
 
     public boolean previous() {

h2/src/main/org/h2/index/ViewIndex.java

@@ -20,6 +20,7 @@ import org.h2.result.ResultInterface;
 import org.h2.result.Row;
 import org.h2.result.SearchRow;
 import org.h2.table.Column;
+import org.h2.table.IndexColumn;
 import org.h2.table.TableView;
 import org.h2.util.IntArray;
 import org.h2.util.New;
@@ -161,7 +162,7 @@ public class ViewIndex extends BaseIndex {
             ResultInterface recResult = view.getRecursiveResult();
             if (recResult != null) {
                 recResult.reset();
-                return new ViewCursor(table, recResult);
+                return new ViewCursor(this, recResult, first, last);
             }
             if (query == null) {
                 query = (Query) createSession.prepare(querySQL, true);
@@ -200,7 +201,7 @@ public class ViewIndex extends BaseIndex {
             }
             view.setRecursiveResult(null);
             result.done();
-            return new ViewCursor(table, result);
+            return new ViewCursor(this, result, first, last);
         }
         ArrayList<Parameter> paramList = query.getParameters();
         if (originalParameters != null) {
@@ -239,7 +240,7 @@ public class ViewIndex extends BaseIndex {
             }
         }
         ResultInterface result = query.query(0);
-        return new ViewCursor(table, result);
+        return new ViewCursor(this, result, first, last);
     }
 
     private static void setParameter(ArrayList<Parameter> paramList, int x, Value v) {
@@ -260,11 +261,13 @@ public class ViewIndex extends BaseIndex {
         int firstIndexParam = originalParameters == null ? 0 : originalParameters.size();
         firstIndexParam += view.getParameterOffset();
         IntArray paramIndex = new IntArray();
+        int indexColumnCount = 0;
         for (int i = 0; i < masks.length; i++) {
             int mask = masks[i];
             if (mask == 0) {
                 continue;
             }
+            indexColumnCount++;
             paramIndex.add(i);
             if ((mask & IndexCondition.RANGE) == IndexCondition.RANGE) {
                 // two parameters for range queries: >= x AND <= y
@@ -296,6 +299,35 @@ public class ViewIndex extends BaseIndex {
         }
         columns = new Column[columnList.size()];
         columnList.toArray(columns);
+
+        // reconstruct the index columns from the masks
+        this.indexColumns = new IndexColumn[indexColumnCount];
+        this.columnIds = new int[indexColumnCount];
+        for (int type = 0, indexColumnId = 0; type < 2; type++) {
+            for (int i = 0; i < masks.length; i++) {
+                int mask = masks[i];
+                if (mask == 0) {
+                    continue;
+                }
+                if (type == 0) {
+                    if ((mask & IndexCondition.EQUALITY) != IndexCondition.EQUALITY) {
+                        // the first columns need to be equality conditions
+                        continue;
+                    }
+                } else {
+                    if ((mask & IndexCondition.EQUALITY) == IndexCondition.EQUALITY) {
+                        // then only range conditions
+                        continue;
+                    }
+                }
+                IndexColumn c = new IndexColumn();
+                c.column = table.getColumn(i);
+                indexColumns[indexColumnId] = c;
+                columnIds[indexColumnId] = c.column.getColumnId();
+                indexColumnId++;
+            }
+        }
+
         String sql = q.getPlanSQL();
         q = (Query) session.prepare(sql, true);
         return q;

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

 --- special grammar and test cases ---------------------------------------------------------------------------------------------
+create table test(x int) as select x from system_range(1, 2);
+> ok
+
+select * from (select rownum r from test) where r in (1, 2);
+> R
+> -
+> 1
+> 2
+> rows: 2
+
+select * from (select rownum r from test) where r = 1 or r = 2;
+> R
+> -
+> 1
+> 2
+> rows: 2
+
+drop table test;
+> ok
+
 select 2^2;
 > exception