Merge pull request #1754 from katzyn/window

Fix window functions in JOIN with ON condition

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>PR #1754: Fix window functions in JOIN with ON condition
+</li>
 <li>Issue #1751: making it easier to open console and create local databases
 </li>
 <li>Issue #1750: JOIN t ON t.col IN (SELECT ...) throws AssertionError

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

@@ -1705,6 +1705,14 @@ public class Select extends Query {
         }
         comp = comp.optimize(session);
         boolean addToCondition = true;
+        if (isWindowQuery) {
+            if (qualify == null) {
+                qualify = comp;
+            } else {
+                qualify = new ConditionAndOr(ConditionAndOr.AND, comp, qualify);
+            }
+            return;
+        }
         if (isGroupQuery) {
             addToCondition = false;
             for (int i = 0; groupIndex != null && i < groupIndex.length; i++) {

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

@@ -665,3 +665,19 @@ SELECT X.ID FROM TEST X JOIN TEST Y ON Y.ID IN (SELECT 1);
 
 DROP TABLE TEST;
 > ok
+
+CREATE TABLE TEST(A INT, B INT) AS VALUES (1, 10), (2, 20), (4, 40);
+> ok
+
+SELECT T1.A, T2.ARR FROM TEST T1 JOIN (
+    SELECT A, ARRAY_AGG(B) OVER (ORDER BY B ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING) ARR FROM TEST
+) T2 ON T1.A = T2.A;
+> A ARR
+> - --------
+> 1 [20, 40]
+> 2 [40]
+> 4 null
+> rows: 3
+
+DROP TABLE TEST;
+> ok