Fix Select.getGroupDataIfCurrent() for some queries

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

@@ -44,6 +44,7 @@ import org.h2.table.IndexColumn;
 import org.h2.table.JoinBatch;
 import org.h2.table.Table;
 import org.h2.table.TableFilter;
+import org.h2.table.TableFilter.TableFilterVisitor;
 import org.h2.table.TableType;
 import org.h2.table.TableView;
 import org.h2.util.ColumnNamer;
@@ -117,6 +118,11 @@ public class Select extends Query {
      */
     boolean[] groupByExpression;
 
+    /**
+     * Select with grouped data for aggregates.
+     */
+    private Select groupSelect;
+
     /**
      * Grouped data for aggregates.
      */
@@ -213,6 +219,10 @@ public class Select extends Query {
         return group;
     }
 
+    void setGroupSelect(Select groupSelect) {
+        this.groupSelect = groupSelect;
+    }
+
     /**
      * Get the group data if there is currently a group-by active.
      *
@@ -220,6 +230,9 @@ public class Select extends Query {
      * @return the grouped data
      */
     public SelectGroups getGroupDataIfCurrent(boolean window) {
+        if (groupSelect != null) {
+            return groupSelect.getGroupDataIfCurrent(window);
+        }
         return groupData != null && (window || groupData.isCurrentGroup()) ? groupData : null;
     }
 
@@ -1333,6 +1346,15 @@ public class Select extends Query {
                 isGroupSortedQuery = true;
             }
         }
+        topTableFilter.visit(new TableFilterVisitor() {
+            @Override
+            public void accept(TableFilter f) {
+                Select s = f.getSelect();
+                if (s != null && s != Select.this) {
+                    s.setGroupSelect(Select.this);
+                }
+            }
+        });
         expressionArray = expressions.toArray(new Expression[0]);
         isPrepared = true;
     }

h2/src/test/org/h2/test/scripts/dml/select.sql

@@ -584,3 +584,21 @@ SELECT COUNT(*) C FROM TEST QUALIFY C < 1;
 
 DROP TABLE TEST;
 > ok
+
+SELECT A, ROW_NUMBER() OVER (ORDER BY B) R
+FROM (VALUES (1, 2), (2, 1), (3, 3)) T(A, B);
+> A R
+> - -
+> 1 2
+> 2 1
+> 3 3
+> rows: 3
+
+SELECT X, A, ROW_NUMBER() OVER (ORDER BY B) R
+FROM (SELECT 1 X), (VALUES (1, 2), (2, 1), (3, 3)) T(A, B);
+> X A R
+> - - -
+> 1 1 2
+> 1 2 1
+> 1 3 3
+> rows: 3