github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7647] Fixed parser

Browse Source
This commit is contained in:
lukaseder 2018-07-06 15:44:43 +02:00
parent deac176fd2
commit c66e612c51
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -1287,7 +1287,7 @@ final class ParserImpl implements Parser {
boolean groups = !rows && !range && parseKeywordIf(ctx, "GROUPS");
if ((rows || range || groups) && !orderByAllowed)
throw ctx.exception("ROWS or RANGE not allowed");
throw ctx.exception("ROWS, RANGE, or GROUPS not allowed");
if (rows || range || groups) {
Long n;
@ -1452,14 +1452,14 @@ final class ParserImpl implements Parser {
else
throw ctx.expected("BETWEEN", "CURRENT ROW", "UNBOUNDED", "integer literal");
if (parseIf(ctx, "EXCLUDE"))
if (parseIf(ctx, "CURRENT ROW"))
if (parseKeywordIf(ctx, "EXCLUDE"))
if (parseKeywordIf(ctx, "CURRENT ROW"))
return s4.excludeCurrentRow();
else if (parseIf(ctx, "TIES"))
else if (parseKeywordIf(ctx, "TIES"))
return s4.excludeTies();
else if (parseIf(ctx, "GROUP"))
else if (parseKeywordIf(ctx, "GROUP"))
return s4.excludeGroup();
else if (parseIf(ctx, "NO OTHERS"))
else if (parseKeywordIf(ctx, "NO OTHERS"))
return s4.excludeNoOthers();
else
throw ctx.expected("CURRENT ROW", "TIES", "GROUP", "NO OTHERS");