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

[#6485] Compound keywords aren't parsed correctly when they contain line breaks

Browse Source
This commit is contained in:
lukaseder 2018-01-26 14:18:42 +01:00
parent c20dc27254
commit 48ac06bb60
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1203,13 +1203,20 @@ final class ParserImpl implements Parser {
target = target.as(parseIdentifier(ctx));
parseKeyword(ctx, "USING");
parse(ctx, '(');
Select<?> using = parseSelect(ctx);
TableLike<?> usingTable = using;
parse(ctx, ')');
Table<?> table = null;
Select<?> using = null;
if (parseIf(ctx, '(')) {
using = parseSelect(ctx);
parse(ctx, ')');
}
else {
table = parseTableName(ctx);
}
TableLike<?> usingTable = (table != null ? table : using);
if (parseKeywordIf(ctx, "AS") || !peekKeyword(ctx, "ON"))
usingTable = DSL.table(using).as(parseIdentifier(ctx));
usingTable = (table != null ? table : DSL.table(using)).as(parseIdentifier(ctx));
parseKeyword(ctx, "ON");
Condition on = parseCondition(ctx);
@ -6715,17 +6722,18 @@ final class ParserImpl implements Parser {
for (int i = 0; i < length; i++) {
char c = keyword.charAt(i);
int p = ctx.position + i + skip;
switch (c) {
case ' ':
case '\t':
case '\r':
case '\n':
skip = skip + (afterWhitespace(ctx, ctx.position + i + skip) - ctx.position - i - 1);
skip = skip + (afterWhitespace(ctx, p) - p - 1);
break;
default:
if (upper(ctx.sql[ctx.position + i + skip]) != keyword.charAt(i))
if (upper(ctx.sql[p]) != keyword.charAt(i))
return false;
break;