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

[jOOQ/jOOQ#10675] Parser doesn't recognise Oracle ( + ) operator, if it contains whitespace

Browse Source
This commit is contained in:
Lukas Eder 2020-09-23 11:53:38 +02:00
parent f5fb7b356b
commit 98e116e985
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6486,7 +6486,7 @@ final class ParserImpl implements Parser {
else if ((r = parseFieldUnsignedNumericLiteralIf(ctx, Sign.MINUS)) == null)
r = toField(ctx, parseTerm(ctx, type)).neg();
if (parseIf(ctx, "(+)") && ctx.requireProEdition())
if (parseTokensIf(ctx, '(', '+', ')') && ctx.requireProEdition())
@ -10072,7 +10072,7 @@ final class ParserImpl implements Parser {
return sequence(name.qualifier()).currval();
}
if (ctx.dsl.settings().getParseUnknownFunctions() == ParseUnknownFunctions.IGNORE && peek(ctx, '(') && !peek(ctx, "(+)")) {
if (ctx.dsl.settings().getParseUnknownFunctions() == ParseUnknownFunctions.IGNORE && peek(ctx, '(') && !peekTokens(ctx, '(', '+', ')')) {
List<Field<?>> arguments = new ArrayList<>();
parse(ctx, '(');
@ -11441,6 +11441,42 @@ final class ParserImpl implements Parser {
return ctx.substring(start, stop);
}
private static final boolean parseTokens(ParserContext ctx, char... tokens) {
boolean result = parseTokensIf(ctx, tokens);
if (!result)
throw ctx.expected(new String(tokens));
return result;
}
private static final boolean parseTokensIf(ParserContext ctx, char... tokens) {
int position = ctx.position();
for (char token : tokens) {
if (!parseIf(ctx, token)) {
ctx.position(position);
return false;
}
}
return true;
}
private static final boolean peekTokens(ParserContext ctx, char... tokens) {
int position = ctx.position();
for (char token : tokens) {
if (!parseIf(ctx, token)) {
ctx.position(position);
return false;
}
}
ctx.position(position);
return true;
}
private static final boolean parse(ParserContext ctx, String string) {
boolean result = parseIf(ctx, string);