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

[#3630] ArrayOutOfBoundsException when using backslash escaping in MySQL with jOOQ plain SQL

Browse Source
This commit is contained in:
Lukas Eder 2014-10-06 15:00:44 +02:00
parent 426255e6fa
commit c8c5bb16d8
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jOOQ/src/main/java/org/jooq/conf/SettingsTools.java
View File

@ -130,6 +130,21 @@ public final class SettingsTools {
return PREPARED_STATEMENT;
}
/**
* Get the value BackslashEscaping value.
*/
public static final BackslashEscaping getBackslashEscaping(Settings settings) {
if (settings != null) {
BackslashEscaping result = settings.getBackslashEscaping();
if (result != null) {
return result;
}
}
return BackslashEscaping.OFF;
}
/**
* Whether a {@link PreparedStatement} should be executed.
*/

13
jOOQ/src/main/java/org/jooq/impl/Utils.java
View File

@ -44,9 +44,11 @@ import static java.lang.Boolean.FALSE;
// ...
import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.conf.BackslashEscaping.ON;
import static org.jooq.conf.ParamType.INLINED;
import static org.jooq.conf.ParamType.NAMED;
import static org.jooq.conf.ParamType.NAMED_OR_INLINED;
import static org.jooq.conf.SettingsTools.getBackslashEscaping;
import static org.jooq.conf.SettingsTools.reflectionCaching;
import static org.jooq.conf.SettingsTools.updatablePrimaryKeys;
import static org.jooq.impl.DSL.concat;
@ -138,6 +140,7 @@ import org.jooq.Table;
import org.jooq.UDT;
import org.jooq.UDTRecord;
import org.jooq.UpdatableRecord;
import org.jooq.conf.BackslashEscaping;
import org.jooq.conf.Settings;
import org.jooq.exception.DataAccessException;
import org.jooq.exception.InvalidResultException;
@ -1163,6 +1166,9 @@ final class Utils {
// [#1593] Create a dummy renderer if we're in bind mode
if (render == null) render = new DefaultRenderContext(bind.configuration());
// [#3630] Depending on this setting, we need to consider backslashes as escape characters within string literals.
BackslashEscaping escaping = getBackslashEscaping(ctx.configuration().settings());
SQLDialect dialect = render.configuration().dialect();
SQLDialect family = dialect.family();
String[][] quotes = QUOTES.get(family);
@ -1206,8 +1212,13 @@ final class Utils {
// Consume the whole string literal
for (;;) {
// [#3000] [#3630] Consume backslash-escaped characters if needed
if (sqlChars[i] == '\\' && escaping == ON) {
render.sql(sqlChars[i++]);
}
// Consume an escaped apostrophe
if (peek(sqlChars, i, "''")) {
else if (peek(sqlChars, i, "''")) {
render.sql(sqlChars[i++]);
}