From afdabc3bad7cdb953ec7a1d097786c10a608a145 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 17 Jan 2024 18:16:01 +0800 Subject: [PATCH] fix code --- .../java/org/dromara/hutool/db/AbstractDb.java | 7 +++++-- .../java/org/dromara/hutool/db/StatementUtil.java | 14 -------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java index e3d6b43b4..99a55a831 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java @@ -13,6 +13,7 @@ package org.dromara.hutool.db; import org.dromara.hutool.core.func.SerFunction; +import org.dromara.hutool.db.config.DbConfig; import org.dromara.hutool.db.dialect.Dialect; import org.dromara.hutool.db.ds.DSWrapper; import org.dromara.hutool.db.handler.*; @@ -44,11 +45,12 @@ public abstract class AbstractDb> extends DefaultConnect * 是否支持事务 */ protected Boolean isSupportTransaction = null; + protected DialectRunner runner; + protected DbConfig dbConfig; /** * 是否大小写不敏感(默认大小写不敏感) */ protected boolean caseInsensitive = true; - protected DialectRunner runner; // ------------------------------------------------------- Constructor start @@ -61,7 +63,8 @@ public abstract class AbstractDb> extends DefaultConnect public AbstractDb(final DataSource ds, final Dialect dialect) { super(ds); if(ds instanceof DSWrapper){ - this.caseInsensitive = ((DSWrapper) ds).getDbConfig().isCaseInsensitive(); + this.dbConfig = ((DSWrapper) ds).getDbConfig(); + this.caseInsensitive = this.dbConfig.isCaseInsensitive(); } this.runner = new DialectRunner(dialect); } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/StatementUtil.java b/hutool-db/src/main/java/org/dromara/hutool/db/StatementUtil.java index 9fa57817d..a5fcc078a 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/StatementUtil.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/StatementUtil.java @@ -23,7 +23,6 @@ import org.dromara.hutool.db.sql.StatementWrapper; import org.dromara.hutool.db.sql.filter.SqlLogFilter; import java.sql.*; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -47,19 +46,6 @@ public class StatementUtil { return prepareStatement(conn, sqlBuilder.build(), sqlBuilder.getParamValueArray()); } - /** - * 创建{@link PreparedStatement} - * - * @param conn 数据库连接 - * @param sql SQL语句,使用"?"做为占位符 - * @param params "?"对应参数列表 - * @return {@link PreparedStatement} - * @since 3.2.3 - */ - public static PreparedStatement prepareStatement(final Connection conn, final String sql, final Collection params) { - return prepareStatement(conn, sql, params.toArray(new Object[0])); - } - /** * 创建{@link PreparedStatement} *