fix issues#I96RMR

This commit is contained in:
Looly 2024-03-08 11:21:33 +08:00
parent 27eae584fa
commit 0adc4fd329

View File

@ -16,6 +16,7 @@ import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.iter.ArrayIter; import org.dromara.hutool.core.collection.iter.ArrayIter;
import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.db.DbException; import org.dromara.hutool.db.DbException;
import org.dromara.hutool.db.config.DbConfig; import org.dromara.hutool.db.config.DbConfig;
import org.dromara.hutool.db.handler.ResultSetUtil; import org.dromara.hutool.db.handler.ResultSetUtil;
@ -48,7 +49,7 @@ public class StatementUtil {
return StatementBuilder.of() return StatementBuilder.of()
.setConnection(conn) .setConnection(conn)
.setReturnGeneratedKey(returnGeneratedKey) .setReturnGeneratedKey(returnGeneratedKey)
.setSqlFilter(config.getSqlFilters()) .setSqlFilter(Opt.ofNullable(config).map(DbConfig::getSqlFilters).get())
.setSql(sql) .setSql(sql)
.setParams(params) .setParams(params)
.build(); .build();
@ -83,7 +84,7 @@ public class StatementUtil {
return StatementBuilder.of() return StatementBuilder.of()
.setConnection(conn) .setConnection(conn)
.setReturnGeneratedKey(false) .setReturnGeneratedKey(false)
.setSqlFilter(config.getSqlFilters()) .setSqlFilter(Opt.ofNullable(config).map(DbConfig::getSqlFilters).get())
.setSql(sql) .setSql(sql)
.setParams(ArrayUtil.ofArray(paramsBatch, Object.class)) .setParams(ArrayUtil.ofArray(paramsBatch, Object.class))
.buildForBatch(); .buildForBatch();
@ -103,7 +104,7 @@ public class StatementUtil {
public static CallableStatement prepareCall(final DbConfig config, final Connection conn, final String sql, final Object... params) throws SQLException { public static CallableStatement prepareCall(final DbConfig config, final Connection conn, final String sql, final Object... params) throws SQLException {
return StatementBuilder.of() return StatementBuilder.of()
.setConnection(conn) .setConnection(conn)
.setSqlFilter(config.getSqlFilters()) .setSqlFilter(Opt.ofNullable(config).map(DbConfig::getSqlFilters).get())
.setSql(sql) .setSql(sql)
.setParams(params) .setParams(params)
.buildForCall(); .buildForCall();