Move QUALIFY clause after WINDOW clause

h2/src/docsrc/help/help.csv

@@ -11,8 +11,8 @@ selectExpression [,...]
 [ FROM tableExpression [,...] ]
 [ WHERE expression ]
 [ GROUP BY expression [,...] ] [ HAVING expression ]
-[ QUALIFY expression ]
 [ WINDOW { { windowName AS windowSpecification } [,...] } ]
+[ QUALIFY expression ]
 [ { UNION [ ALL ] | EXCEPT | MINUS | INTERSECT } select ]
 [ ORDER BY order [,...] ]
 [ LIMIT expression [ OFFSET expression ] [ SAMPLE_SIZE rowCountInt ] ]

h2/src/main/org/h2/command/Parser.java

@@ -2750,11 +2750,6 @@ public class Parser {
             Expression condition = readExpression();
             command.setHaving(condition);
         }
-        if (readIf(QUALIFY)) {
-            command.setWindowQuery();
-            Expression condition = readExpression();
-            command.setQualify(condition);
-        }
         if (readIf(WINDOW)) {
             do {
                 int index = parseIndex;
@@ -2766,6 +2761,11 @@ public class Parser {
                 }
             } while (readIf(COMMA));
         }
+        if (readIf(QUALIFY)) {
+            command.setWindowQuery();
+            Expression condition = readExpression();
+            command.setQualify(condition);
+        }
         command.setParameterList(parameters);
         currentSelect = oldSelect;
         currentPrepared = oldPrepared;

h2/src/test/org/h2/test/scripts/functions/window/row_number.sql

@@ -84,12 +84,12 @@ SELECT *,
 > rows: 9
 
 SELECT *,
-    ROW_NUMBER() OVER (PARTITION BY CATEGORY ORDER BY ID) RN,
-    RANK() OVER (PARTITION BY CATEGORY ORDER BY ID) RK,
-    DENSE_RANK() OVER (PARTITION BY CATEGORY ORDER BY ID) DR,
-    ROUND(PERCENT_RANK() OVER (PARTITION BY CATEGORY ORDER BY ID), 2) PR,
-    ROUND(CUME_DIST() OVER (PARTITION BY CATEGORY ORDER BY ID), 2) CD
-    FROM TEST QUALIFY ROW_NUMBER() OVER (PARTITION BY CATEGORY ORDER BY ID) = 2;
+    ROW_NUMBER() OVER W RN,
+    RANK() OVER W RK,
+    DENSE_RANK() OVER W DR,
+    ROUND(PERCENT_RANK() OVER W, 2) PR,
+    ROUND(CUME_DIST() OVER W, 2) CD
+    FROM TEST WINDOW W AS (PARTITION BY CATEGORY ORDER BY ID) QUALIFY ROW_NUMBER() OVER W = 2;
 > ID CATEGORY VALUE RN RK DR PR  CD
 > -- -------- ----- -- -- -- --- ----
 > 2  1        12    2  2  2  0.5 0.67