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

[jOOQ/jOOQ#12998] Remove redundant utility

Browse Source 
SettingsTools.getParamType() already checks for
StatementType.STATIC_STATEMENT usage
This commit is contained in:
Lukas Eder 2024-02-27 16:37:07 +01:00
parent 1e800f53bc
commit dd09631420
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ/src/main/java/org/jooq/impl/AbstractContext.java
View File

@ -220,7 +220,11 @@ abstract class AbstractContext<C extends Context<C>> extends AbstractScope imple
this.visitListenersEnd = null;
}
this.forcedParamType = Tools.effectiveParamType(settings());
this.forcedParamType = SettingsTools.getStatementType(settings()) == StatementType.STATIC_STATEMENT
? ParamType.INLINED
: SettingsTools.getParamType(settings()) == ParamType.FORCE_INDEXED
? ParamType.INDEXED
: null;
ParamCastMode m = settings().getParamCastMode();
this.castModeOverride =

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

@ -42,7 +42,6 @@ import static org.jooq.conf.ParamType.INLINED;
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.effectiveParamType;
import static org.jooq.impl.Tools.map;
import java.sql.CallableStatement;
@ -59,6 +58,7 @@ 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;
@ -79,7 +79,7 @@ final class ParsingConnection extends DefaultConnection {
configuration.connectionProvider().acquire(),
configuration.settings(),
null,
effectiveParamType(configuration.settings()) == INLINED
SettingsTools.getParamType(configuration.settings()) == INLINED
));
if (((SettingsEnabledConnection) getDelegate()).getDelegate() == null)
@ -195,7 +195,7 @@ final class ParsingConnection extends DefaultConnection {
int size = p.size();
Rendered rendered = size == 0 ? translate(configuration, sql) : translate(configuration, sql, p.get(0).toArray(EMPTY_PARAM));
PreparedStatement s = prepare.apply(rendered.sql);
boolean inlined = effectiveParamType(configuration.settings()) == INLINED;
boolean inlined = SettingsTools.getParamType(configuration.settings()) == INLINED;
for (int i = 0; i < size; i++) {

8
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -7876,12 +7876,4 @@ final class Tools {
static final boolean sortable(Field<?> f) {
return !f.getDataType().isBinary();
}
static final ParamType effectiveParamType(Settings settings) {
return SettingsTools.getStatementType(settings) == StatementType.STATIC_STATEMENT
? ParamType.INLINED
: SettingsTools.getParamType(settings) == ParamType.FORCE_INDEXED
? ParamType.INDEXED
: null;
}
}