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

[jOOQ/jOOQ#8728] Parser cannot handle double quoted string literals in dialects that support them

Browse Source
This commit is contained in:
Lukas Eder 2019-06-07 11:50:16 +02:00
parent 351b45b1ae
commit 6e7eda9a36
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ import static java.util.Collections.singletonList;
// ...
// ...
// ...
// ...
import static org.jooq.conf.ParseWithMetaLookups.IGNORE_ON_FAILURE;
import static org.jooq.conf.ParseWithMetaLookups.THROW_ON_FAILURE;
import static org.jooq.impl.DSL.abs;
@ -5284,6 +5285,14 @@ final class ParserImpl implements Parser {
case '?':
return parseBindVariable(ctx);
case '\'':
return inline(parseStringLiteral(ctx));
@ -9050,9 +9059,13 @@ final class ParserImpl implements Parser {
if (parseIf(ctx, 'q', '\'', false) || parseIf(ctx, 'Q', '\'', false))
return parseOracleQuotedStringLiteral(ctx);
else if (parseIf(ctx, 'e', '\'', false) || parseIf(ctx, 'E', '\'', false))
return parseUnquotedStringLiteral(ctx, true);
return parseUnquotedStringLiteral(ctx, true, '\'');
else if (peek(ctx, '\''))
return parseUnquotedStringLiteral(ctx, false);
return parseUnquotedStringLiteral(ctx, false, '\'');
else if (peek(ctx, '$'))
return parseDollarQuotedStringLiteralIf(ctx);
else
@ -9201,8 +9214,8 @@ final class ParserImpl implements Parser {
return null;
}
private static final String parseUnquotedStringLiteral(ParserContext ctx, boolean postgresEscaping) {
parse(ctx, '\'', false);
private static final String parseUnquotedStringLiteral(ParserContext ctx, boolean postgresEscaping, char delimiter) {
parse(ctx, delimiter, false);
StringBuilder sb = new StringBuilder();
@ -9305,8 +9318,18 @@ final class ParserImpl implements Parser {
break;
}
case '\'': {
if (ctx.character(i + 1) != '\'') {
if (ctx.character(i + 1) != delimiter) {
ctx.position(i + 1);
parseWhitespaceIf(ctx);
return sb.toString();