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

[#6485] Fixed regression

Browse Source
This commit is contained in:
lukaseder 2018-01-26 14:33:53 +01:00
parent 48ac06bb60
commit 457b5bb8cd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,6 +384,8 @@ final class ParserImpl implements Parser {
do {
parseDelimiterSpecifications(ctx);
while (parseIf(ctx, ctx.delimiter));
query = parseQuery(ctx, false);
if (query == IGNORE || query == IGNORE_NO_DELIMITER)
continue;
@ -4862,16 +4864,16 @@ final class ParserImpl implements Parser {
Condition condition;
keep = over = filter = agg = parseCountIf(ctx);
if (agg == null)
if (filter == null)
keep = over = filter = agg = parseGeneralSetFunctionIf(ctx);
if (agg == null && !basic)
if (filter == null && !basic)
over = filter = agg = parseBinarySetFunctionIf(ctx);
if (agg == null && !basic)
if (filter == null && !basic)
over = filter = parseOrderedSetFunctionIf(ctx);
if (agg == null && !basic)
if (filter == null && !basic)
over = filter = parseArrayAggFunctionIf(ctx);
if (agg == null && over == null)
if (filter == null && over == null)
if (!basic)
return parseSpecialAggregateFunctionIf(ctx);
else
@ -4905,13 +4907,13 @@ final class ParserImpl implements Parser {
result = over = filter.filterWhere(condition);
}
else if (agg != null)
result = agg;
else if (filter != null)
result = filter;
else
result = over;
if (!basic && parseKeywordIf(ctx, "OVER")) {
Object nameOrSpecification = parseWindowNameOrSpecification(ctx, agg != null);
Object nameOrSpecification = parseWindowNameOrSpecification(ctx, filter != null);
if (nameOrSpecification instanceof Name)
result = over.over((Name) nameOrSpecification);