[#5594] [#7171] Parser support for FETCH NEXT n PERCENT ROWS

jOOQ · Feb 22, 2018 · 1b393d5 · 1b393d5
1 parent 00a4b5c
commit 1b393d5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
@@ -335,7 +335,7 @@ distinct = ( 'DISTINCT' | 'UNIQUE' ) [ 'ON' '(' fields ')' ] | 'ALL'
 ;
 
 top =
-  'TOP' unsignedInteger [ 'START AT' unsignedInteger | 'WITH TIES' ]
+  'TOP' unsignedInteger [ 'PERCENT' ] [ 'START AT' unsignedInteger | 'WITH TIES' ]
 | 'SKIP' unsignedInteger [ 'FIRST' unsignedInteger ]
 ;
 
@@ -380,10 +380,10 @@ orderBy =
 offsetFetch =
   'OFFSET' unsignedInteger
   [
-    [ 'ROW' | 'ROWS' ] 'FETCH' ( 'FIRST' | 'NEXT' ) [ unsignedInteger ] ( 'ROW' | 'ROWS' ) ( 'ONLY' | 'WITH TIES' )
-  | [ 'LIMIT' unsignedInteger [ 'WITH TIES' ] ]
+    [ 'ROW' | 'ROWS' ] 'FETCH' ( 'FIRST' | 'NEXT' ) [ unsignedInteger ] [ 'PERCENT' ] ( 'ROW' | 'ROWS' ) ( 'ONLY' | 'WITH TIES' )
+  | [ 'LIMIT' unsignedInteger [ 'PERCENT' ] [ 'WITH TIES' ] ]
   ]
-| 'LIMIT' unsignedInteger
+| 'LIMIT' unsignedInteger [ 'PERCENT' ]
   (
     [ 'WITH TIES' ] [ 'OFFSET' unsignedInteger ]
   | [ ',' unsignedInteger ]

diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -760,13 +760,19 @@ else if (peekKeyword(ctx, "FETCH"))
                 if (offsetPostgres) {
                     result.addLimit(limit);
 
+                    if (parseKeywordIf(ctx, "PERCENT"))
+                        result.setLimitPercent(true);
+
                     if (parseKeywordIf(ctx, "WITH TIES"))
                         result.setWithTies(true);
                 }
                 else if (parseIf(ctx, ',')) {
                     result.addLimit(limit, inline((int) (long) parseUnsignedInteger(ctx)));
                 }
                 else {
+                    if (parseKeywordIf(ctx, "PERCENT"))
+                        result.setLimitPercent(true);
+
                     if (parseKeywordIf(ctx, "WITH TIES"))
                         result.setWithTies(true);
 
@@ -782,6 +788,9 @@ else if (!offsetPostgres && parseKeywordIf(ctx, "FETCH")) {
 
                 result.addLimit(inline((int) (long) defaultIfNull(parseUnsignedIntegerIf(ctx), 1L)));
 
+                if (parseKeywordIf(ctx, "PERCENT"))
+                    result.setLimitPercent(true);
+
                 if (!parseKeywordIf(ctx, "ROW") && !parseKeywordIf(ctx, "ROWS"))
                     throw ctx.unexpectedToken();
 
@@ -904,12 +913,15 @@ private static final SelectQueryImpl<Record> parseQueryPrimary(ParserContext ctx
 
         Long limit = null;
         Long offset = null;
+        boolean percent = false;
         boolean withTies = false;
 
         // T-SQL style TOP .. START AT
         if (parseKeywordIf(ctx, "TOP")) {
             limit = parseUnsignedInteger(ctx);
 
+            percent = parseKeywordIf(ctx, "PERCENT");
+
             if (parseKeywordIf(ctx, "START AT"))
                 offset = parseUnsignedInteger(ctx);
             else if (parseKeywordIf(ctx, "WITH TIES"))
@@ -1062,6 +1074,9 @@ else if (parseKeywordIf(ctx, "GROUPING SETS")) {
             else
                 result.addLimit((int) (long) limit);
 
+        if (percent)
+            result.setLimitPercent(percent);
+
         if (withTies)
             result.setWithTies(true);