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

[jOOQ/jOOQ#12596] ParamType.INLINED produces wrong behaviour for cacheParsingConnection

Browse Source
This commit is contained in:
Lukas Eder 2021-11-03 15:06:17 +01:00
parent 05ad90fbe4
commit 4e64c74b02
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jOOQ/src/main/java/org/jooq/impl/ParsingConnection.java
View File

@ -38,6 +38,8 @@
package org.jooq.impl;
import static java.util.Collections.emptyList;
import static org.jooq.conf.SettingsTools.getParamType;
import static org.jooq.impl.CacheType.CACHE_PARSING_CONNECTION;
import static org.jooq.impl.Tools.EMPTY_PARAM;
import static org.jooq.impl.Tools.map;
@ -49,16 +51,21 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.jooq.Configuration;
import org.jooq.DSLContext;
import org.jooq.Param;
import org.jooq.conf.Settings;
import org.jooq.conf.SettingsTools;
import org.jooq.exception.DataAccessException;
import org.jooq.exception.DetachedException;
import org.jooq.impl.DefaultRenderContext.Rendered;
import org.jooq.tools.JooqLogger;
import org.jooq.tools.jdbc.DefaultConnection;
import org.jetbrains.annotations.NotNull;
/**
* @author Lukas Eder
*/
@ -124,16 +131,30 @@ final class ParsingConnection extends DefaultConnection {
static final Rendered translate(Configuration configuration, String sql, Param<?>... bindValues) {
log.debug("Translating from", sql);
Rendered result = null;
Rendered result = Cache.run(
configuration,
() -> {
log.debug("Translation cache miss", sql);
return new CacheValue(configuration, sql, bindValues);
},
CacheType.CACHE_PARSING_CONNECTION,
() -> Cache.key(sql, map(nonNull(bindValues), f -> f.getDataType()))
).rendered(bindValues);
Supplier<CacheValue> miss = () -> {
log.debug("Translation cache miss", sql);
return new CacheValue(configuration, sql, bindValues);
};
Settings settings = configuration.settings();
if (CACHE_PARSING_CONNECTION.category.predicate.test(settings) && bindValues.length > 0) {
switch (getParamType(settings)) {
case INLINED:
case NAMED_OR_INLINED:
result = miss.get().rendered(bindValues);
break;
}
}
if (result == null)
result = Cache.run(
configuration,
miss,
CACHE_PARSING_CONNECTION,
() -> Cache.key(sql, map(nonNull(bindValues), f -> f.getDataType()))
).rendered(bindValues);
log.debug("Translating to", result.sql);
return result;