From 36a23af4503febb32fb007ac24f0074983f6ed0d Mon Sep 17 00:00:00 2001 From: carm Date: Wed, 26 Jan 2022 14:49:19 +0800 Subject: [PATCH] =?UTF-8?q?[v0.3.1]=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=B0=8F=E7=9A=84=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/easysql/api/action/SQLUpdateBatchAction.java | 1 + .../action/PreparedSQLBatchUpdateActionImpl.java | 2 +- .../easysql/action/PreparedSQLUpdateActionImpl.java | 2 +- .../easysql/action/query/PreparedQueryActionImpl.java | 2 +- .../builder/impl/AbstractConditionalBuilder.java | 2 +- .../easysql/builder/impl/TableCreateBuilderImpl.java | 2 +- .../easysql/builder/impl/TableQueryBuilderImpl.java | 2 +- .../cc/carm/lib/easysql/manager/SQLManagerImpl.java | 3 ++- .../java/cc/carm/lib/easysql/util/StatementUtil.java | 10 +++------- .../main/java/cc/carm/lib/easysql/testrunner/Main.java | 2 ++ 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java index b7ce524..bbed930 100644 --- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java +++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java @@ -15,6 +15,7 @@ public interface SQLUpdateBatchAction extends SQLAction> { */ SQLUpdateBatchAction addBatch(@NotNull String sql); + @Override default @NotNull String getSQLContent() { return getSQLContents().get(0); } diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java index c8d498a..3a19c88 100644 --- a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java +++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java @@ -35,7 +35,7 @@ public class PreparedSQLBatchUpdateActionImpl } @Override - public PreparedSQLUpdateBatchAction addParamsBatch(Object[] params) { + public PreparedSQLUpdateBatchAction addParamsBatch(Object... params) { this.allParams.add(params); return this; } diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLUpdateActionImpl.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLUpdateActionImpl.java index 9e3d06d..a6612c9 100644 --- a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLUpdateActionImpl.java +++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLUpdateActionImpl.java @@ -35,7 +35,7 @@ public class PreparedSQLUpdateActionImpl } @Override - public PreparedSQLUpdateActionImpl setParams(Object[] params) { + public PreparedSQLUpdateActionImpl setParams(Object... params) { this.params = params; return this; } diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/PreparedQueryActionImpl.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/PreparedQueryActionImpl.java index 8fcb292..814dd77 100644 --- a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/PreparedQueryActionImpl.java +++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/PreparedQueryActionImpl.java @@ -25,7 +25,7 @@ public class PreparedQueryActionImpl extends QueryActionImpl implements Prepared } @Override - public PreparedQueryActionImpl setParams(@Nullable Object[] params) { + public PreparedQueryActionImpl setParams(@Nullable Object... params) { this.params = params; return this; } diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java index f25533b..7aa552c 100644 --- a/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java +++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java @@ -62,7 +62,7 @@ public abstract class AbstractConditionalBuilder executeSQLBatch(@NotNull String sql, String[] moreSQL) { + public List executeSQLBatch(@NotNull String sql, String... moreSQL) { SQLUpdateBatchAction action = new SQLUpdateBatchActionImpl(this, sql); if (moreSQL != null && moreSQL.length > 0) { Arrays.stream(moreSQL).forEach(action::addBatch); diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/util/StatementUtil.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/util/StatementUtil.java index 77ccb54..abeec94 100644 --- a/easysql-impl/src/main/java/cc/carm/lib/easysql/util/StatementUtil.java +++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/util/StatementUtil.java @@ -128,16 +128,12 @@ public class StatementUtil { * @return 数据类型，默认为 {@link Types#VARCHAR} */ public static int getNullType(PreparedStatement statement, int paramIndex) { - int sqlType = Types.VARCHAR; - - final ParameterMetaData pmd; try { - pmd = statement.getParameterMetaData(); - sqlType = pmd.getParameterType(paramIndex); + ParameterMetaData pmd = statement.getParameterMetaData(); + return pmd.getParameterType(paramIndex); } catch (SQLException ignore) { + return Types.VARCHAR; } - - return sqlType; } /** diff --git a/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java b/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java index f460c32..d8fc913 100644 --- a/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java +++ b/example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java @@ -7,12 +7,14 @@ import cc.carm.lib.easysql.testrunner.tests.TableCreateTest; import cc.carm.lib.easysql.testrunner.tests.TableRenameTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.TestOnly; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Scanner; import java.util.Set; +@TestOnly public class Main { public static void main(String[] args) {