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

[#7725] Support parsing unknown, parameterless functions

Browse Source
This commit is contained in:
lukaseder 2018-08-08 10:14:03 +02:00
parent d2a6a0f04c
commit bf33ef5699
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.12.txt
View File

@ -753,6 +753,7 @@ term =
| '{' 't' stringLiteral '}'
| '{' 'fn' term '}'
| '{' 'ts' stringLiteral '}'
| identifier '(' [ field { ',' field } ] ')'
;
truthValue = 'TRUE' | 'FALSE' | 'NULL'

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

@ -4608,7 +4608,7 @@ final class ParserImpl implements Parser {
return field;
else if ((field = parseFieldPowerIf(ctx)) != null)
return field;
else if (parseFunctionNameIf(ctx, "PI"))
else if (parseFunctionNameIf(ctx, "PI") && parse(ctx, '(') && parse(ctx, ')'))
return pi();
if (parseKeywordIf(ctx, "PRIOR"))
@ -6876,12 +6876,15 @@ final class ParserImpl implements Parser {
if (ctx.dsl.settings().getParseUnknownFunctions() == ParseUnknownFunctions.IGNORE && parseIf(ctx, '(')) {
List<Field<?>> arguments = new ArrayList<Field<?>>();
do {
arguments.add(parseField(ctx));
}
while (parseIf(ctx, ','));
if (!parseIf(ctx, ')')) {
do {
arguments.add(parseField(ctx));
}
while (parseIf(ctx, ','));
parse(ctx, ')');
}
parse(ctx, ')');
return function(name, Object.class, arguments.toArray(EMPTY_FIELD));
}
else {