From a2d972621dc7f97f11fa32fdcf2f4e431ca25a19 Mon Sep 17 00:00:00 2001 From: CarmJos Date: Tue, 12 Apr 2022 16:43:38 +0800 Subject: [PATCH] =?UTF-8?q?[0.3.11]=20(=E7=A0=B4=E5=9D=8F=E6=80=A7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0)=20=E4=BB=A4SQLUpdateAction=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=9A=84=E5=80=BC=E4=B8=BA=20Long=20=E4=BB=A5?= =?UTF-8?q?=E9=80=82=E9=85=8D=E8=87=AA=E5=A2=9E=E4=B8=BB=E9=94=AE=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E8=8C=83=E5=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/carm/lib/easysql/api/SQLManager.java | 6 ++-- .../easysql/api/builder/DeleteBuilder.java | 2 +- .../api/builder/TableAlterBuilder.java | 36 +++++++++---------- .../easysql/api/builder/UpdateBuilder.java | 2 +- .../builder/impl/DeleteBuilderImpl.java | 2 +- .../builder/impl/TableAlterBuilderImpl.java | 28 +++++++-------- .../builder/impl/UpdateBuilderImpl.java | 2 +- .../lib/easysql/manager/SQLManagerImpl.java | 6 ++-- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java b/api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java index feba02a..0029e8a 100644 --- a/api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java +++ b/api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java @@ -83,7 +83,7 @@ public interface SQLManager { * @return 更新的行数 * @see SQLUpdateAction */ - @Nullable Integer executeSQL(String sql); + @Nullable Long executeSQL(String sql); /** * 执行一条不需要返回结果的预处理SQL更改(UPDATE、REPLACE、DELETE) @@ -93,7 +93,7 @@ public interface SQLManager { * @return 更新的行数 * @see PreparedSQLUpdateAction */ - @Nullable Integer executeSQL(String sql, Object[] params); + @Nullable Long executeSQL(String sql, Object[] params); /** * 执行多条不需要返回结果的SQL更改(UPDATE、REPLACE、DELETE) @@ -103,7 +103,7 @@ public interface SQLManager { * @return 对应参数返回的行数 * @see PreparedSQLUpdateBatchAction */ - @Nullable List executeSQLBatch(String sql, Iterable paramsBatch); + @Nullable List executeSQLBatch(String sql, Iterable paramsBatch); /** diff --git a/api/src/main/java/cc/carm/lib/easysql/api/builder/DeleteBuilder.java b/api/src/main/java/cc/carm/lib/easysql/api/builder/DeleteBuilder.java index 429001d..27fa2c4 100644 --- a/api/src/main/java/cc/carm/lib/easysql/api/builder/DeleteBuilder.java +++ b/api/src/main/java/cc/carm/lib/easysql/api/builder/DeleteBuilder.java @@ -2,7 +2,7 @@ package cc.carm.lib.easysql.api.builder; import cc.carm.lib.easysql.api.SQLAction; -public interface DeleteBuilder extends ConditionalBuilder> { +public interface DeleteBuilder extends ConditionalBuilder> { String getTableName(); diff --git a/api/src/main/java/cc/carm/lib/easysql/api/builder/TableAlterBuilder.java b/api/src/main/java/cc/carm/lib/easysql/api/builder/TableAlterBuilder.java index 006a534..473a408 100644 --- a/api/src/main/java/cc/carm/lib/easysql/api/builder/TableAlterBuilder.java +++ b/api/src/main/java/cc/carm/lib/easysql/api/builder/TableAlterBuilder.java @@ -10,13 +10,13 @@ import org.jetbrains.annotations.Nullable; public interface TableAlterBuilder extends SQLBuilder { - SQLAction renameTo(@NotNull String newTableName); + SQLAction renameTo(@NotNull String newTableName); - SQLAction changeComment(@NotNull String newTableComment); + SQLAction changeComment(@NotNull String newTableComment); - SQLAction setAutoIncrementIndex(int index); + SQLAction setAutoIncrementIndex(int index); - SQLAction addIndex(@NotNull IndexType indexType, @Nullable String indexName, + SQLAction addIndex(@NotNull IndexType indexType, @Nullable String indexName, @NotNull String columnName, @NotNull String... moreColumns); /** @@ -25,7 +25,7 @@ public interface TableAlterBuilder extends SQLBuilder { * @param indexName 索引名 * @return {@link SQLUpdateAction} */ - SQLAction dropIndex(@NotNull String indexName); + SQLAction dropIndex(@NotNull String indexName); /** * 为该表移除一个外键 @@ -33,14 +33,14 @@ public interface TableAlterBuilder extends SQLBuilder { * @param keySymbol 外键名 * @return {@link SQLUpdateAction} */ - SQLAction dropForeignKey(@NotNull String keySymbol); + SQLAction dropForeignKey(@NotNull String keySymbol); /** * 为该表移除主键(须添加新主键) * * @return {@link SQLUpdateAction} */ - SQLAction dropPrimaryKey(); + SQLAction dropPrimaryKey(); /** * 为表添加一列 @@ -49,7 +49,7 @@ public interface TableAlterBuilder extends SQLBuilder { * @param settings 列的相关设定 * @return {@link SQLUpdateAction} */ - default SQLAction addColumn(@NotNull String columnName, @NotNull String settings) { + default SQLAction addColumn(@NotNull String columnName, @NotNull String settings) { return addColumn(columnName, settings, null); } @@ -63,21 +63,21 @@ public interface TableAlterBuilder extends SQLBuilder { *

若为 "" 则置于首行。 * @return {@link SQLUpdateAction} */ - SQLAction addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn); + SQLAction addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn); - SQLAction renameColumn(@NotNull String columnName, @NotNull String newName); + SQLAction renameColumn(@NotNull String columnName, @NotNull String newName); - SQLAction modifyColumn(@NotNull String columnName, @NotNull String settings); + SQLAction modifyColumn(@NotNull String columnName, @NotNull String settings); - default SQLAction modifyColumn(@NotNull String columnName, @NotNull String columnSettings, @NotNull String afterColumn) { + default SQLAction modifyColumn(@NotNull String columnName, @NotNull String columnSettings, @NotNull String afterColumn) { return modifyColumn(columnName, columnSettings + " AFTER `" + afterColumn + "`"); } - SQLAction removeColumn(@NotNull String columnName); + SQLAction removeColumn(@NotNull String columnName); - SQLAction setColumnDefault(@NotNull String columnName, @NotNull String defaultValue); + SQLAction setColumnDefault(@NotNull String columnName, @NotNull String defaultValue); - SQLAction removeColumnDefault(@NotNull String columnName); + SQLAction removeColumnDefault(@NotNull String columnName); /** * 为该表添加一个自增列 @@ -90,7 +90,7 @@ public interface TableAlterBuilder extends SQLBuilder { * @param unsigned 是否采用 UNSIGNED (即无负数，可以增加自增键的最高数，建议为true) * @return {@link TableCreateBuilder} */ - default SQLAction addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType, + default SQLAction addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType, boolean primary, boolean unsigned) { return addColumn(columnName, (numberType == null ? NumberType.INT : numberType).name() @@ -109,7 +109,7 @@ public interface TableAlterBuilder extends SQLBuilder { * @param numberType 数字类型，若省缺则为 {@link NumberType#INT} * @return {@link TableAlterBuilder} */ - default SQLAction addAutoIncrementColumn(@NotNull String columnName, @NotNull NumberType numberType) { + default SQLAction addAutoIncrementColumn(@NotNull String columnName, @NotNull NumberType numberType) { return addAutoIncrementColumn(columnName, numberType, false, true); } @@ -122,7 +122,7 @@ public interface TableAlterBuilder extends SQLBuilder { * @param columnName 列名 * @return {@link TableAlterBuilder} */ - default SQLAction addAutoIncrementColumn(@NotNull String columnName) { + default SQLAction addAutoIncrementColumn(@NotNull String columnName) { return addAutoIncrementColumn(columnName, NumberType.INT); } diff --git a/api/src/main/java/cc/carm/lib/easysql/api/builder/UpdateBuilder.java b/api/src/main/java/cc/carm/lib/easysql/api/builder/UpdateBuilder.java index 39d5cfd..a47a21e 100644 --- a/api/src/main/java/cc/carm/lib/easysql/api/builder/UpdateBuilder.java +++ b/api/src/main/java/cc/carm/lib/easysql/api/builder/UpdateBuilder.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; import java.util.LinkedHashMap; -public interface UpdateBuilder extends ConditionalBuilder> { +public interface UpdateBuilder extends ConditionalBuilder> { String getTableName(); diff --git a/impl/src/main/java/cc/carm/lib/easysql/builder/impl/DeleteBuilderImpl.java b/impl/src/main/java/cc/carm/lib/easysql/builder/impl/DeleteBuilderImpl.java index 1fde8fb..21ab89b 100644 --- a/impl/src/main/java/cc/carm/lib/easysql/builder/impl/DeleteBuilderImpl.java +++ b/impl/src/main/java/cc/carm/lib/easysql/builder/impl/DeleteBuilderImpl.java @@ -12,7 +12,7 @@ import java.util.Objects; import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote; public class DeleteBuilderImpl - extends AbstractConditionalBuilder> + extends AbstractConditionalBuilder> implements DeleteBuilder { protected final String tableName; diff --git a/impl/src/main/java/cc/carm/lib/easysql/builder/impl/TableAlterBuilderImpl.java b/impl/src/main/java/cc/carm/lib/easysql/builder/impl/TableAlterBuilderImpl.java index 1952f48..df52181 100644 --- a/impl/src/main/java/cc/carm/lib/easysql/builder/impl/TableAlterBuilderImpl.java +++ b/impl/src/main/java/cc/carm/lib/easysql/builder/impl/TableAlterBuilderImpl.java @@ -28,7 +28,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction renameTo(@NotNull String newTableName) { + public SQLAction renameTo(@NotNull String newTableName) { Objects.requireNonNull(newTableName, "table name could not be null"); return new SQLUpdateActionImpl(getManager(), "ALTER TABLE " + withBackQuote(tableName) + " RENAME TO " + withBackQuote(newTableName) @@ -36,7 +36,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction changeComment(@NotNull String newTableComment) { + public SQLAction changeComment(@NotNull String newTableComment) { Objects.requireNonNull(newTableComment, "table comment could not be null"); return new SQLUpdateActionImpl(getManager(), "ALTER TABLE " + withBackQuote(getTableName()) + " COMMENT " + withQuote(newTableComment) @@ -44,15 +44,15 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction setAutoIncrementIndex(int index) { + public SQLAction setAutoIncrementIndex(int index) { return new SQLUpdateActionImpl(getManager(), "ALTER TABLE " + withBackQuote(getTableName()) + " AUTO_INCREMENT=" + index ); } @Override - public SQLAction addIndex(@NotNull IndexType indexType, @Nullable String indexName, - @NotNull String columnName, @NotNull String... moreColumns) { + public SQLAction addIndex(@NotNull IndexType indexType, @Nullable String indexName, + @NotNull String columnName, @NotNull String... moreColumns) { Objects.requireNonNull(indexType, "indexType could not be null"); Objects.requireNonNull(columnName, "column names could not be null"); Objects.requireNonNull(moreColumns, "column names could not be null"); @@ -63,7 +63,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction dropIndex(@NotNull String indexName) { + public SQLAction dropIndex(@NotNull String indexName) { Objects.requireNonNull(indexName, "indexName could not be null"); return createAction( "ALTER TABLE " + withBackQuote(getTableName()) + " DROP INDEX " + withBackQuote(indexName) @@ -71,7 +71,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction dropForeignKey(@NotNull String keySymbol) { + public SQLAction dropForeignKey(@NotNull String keySymbol) { Objects.requireNonNull(keySymbol, "keySymbol could not be null"); return createAction( "ALTER TABLE " + withBackQuote(getTableName()) + " DROP FOREIGN KEY " + withBackQuote(keySymbol) @@ -79,14 +79,14 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction dropPrimaryKey() { + public SQLAction dropPrimaryKey() { return createAction( "ALTER TABLE " + withBackQuote(getTableName()) + " DROP PRIMARY KEY" ); } @Override - public SQLAction addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn) { + public SQLAction addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn) { Objects.requireNonNull(columnName, "columnName could not be null"); Objects.requireNonNull(settings, "settings could not be null"); String orderSettings = null; @@ -105,7 +105,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction renameColumn(@NotNull String columnName, @NotNull String newName) { + public SQLAction renameColumn(@NotNull String columnName, @NotNull String newName) { Objects.requireNonNull(columnName, "columnName could not be null"); Objects.requireNonNull(newName, "please specify new column name"); return createAction( @@ -114,7 +114,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction modifyColumn(@NotNull String columnName, @NotNull String settings) { + public SQLAction modifyColumn(@NotNull String columnName, @NotNull String settings) { Objects.requireNonNull(columnName, "columnName could not be null"); Objects.requireNonNull(settings, "please specify new column settings"); return createAction( @@ -123,7 +123,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction removeColumn(@NotNull String columnName) { + public SQLAction removeColumn(@NotNull String columnName) { Objects.requireNonNull(columnName, "columnName could not be null"); return createAction( "ALTER TABLE " + withBackQuote(getTableName()) + " DROP " + withBackQuote(columnName) @@ -131,7 +131,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction setColumnDefault(@NotNull String columnName, @NotNull String defaultValue) { + public SQLAction setColumnDefault(@NotNull String columnName, @NotNull String defaultValue) { Objects.requireNonNull(columnName, "columnName could not be null"); Objects.requireNonNull(defaultValue, "defaultValue could not be null, if you need to remove the default value, please use #removeColumnDefault()."); return createAction( @@ -140,7 +140,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl } @Override - public SQLAction removeColumnDefault(@NotNull String columnName) { + public SQLAction removeColumnDefault(@NotNull String columnName) { Objects.requireNonNull(columnName, "columnName could not be null"); return createAction( "ALTER TABLE " + withBackQuote(getTableName()) + " ALTER " + withBackQuote(columnName) + " DROP DEFAULT" diff --git a/impl/src/main/java/cc/carm/lib/easysql/builder/impl/UpdateBuilderImpl.java b/impl/src/main/java/cc/carm/lib/easysql/builder/impl/UpdateBuilderImpl.java index 319963e..a82339b 100644 --- a/impl/src/main/java/cc/carm/lib/easysql/builder/impl/UpdateBuilderImpl.java +++ b/impl/src/main/java/cc/carm/lib/easysql/builder/impl/UpdateBuilderImpl.java @@ -13,7 +13,7 @@ import java.util.*; import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote; public class UpdateBuilderImpl - extends AbstractConditionalBuilder> + extends AbstractConditionalBuilder> implements UpdateBuilder { protected final @NotNull String tableName; diff --git a/impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java b/impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java index be1aafa..4549a50 100644 --- a/impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java +++ b/impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java @@ -102,17 +102,17 @@ public class SQLManagerImpl implements SQLManager { } @Override - public Integer executeSQL(String sql) { + public Long executeSQL(String sql) { return new SQLUpdateActionImpl(this, sql).execute(null); } @Override - public Integer executeSQL(String sql, Object[] params) { + public Long executeSQL(String sql, Object[] params) { return new PreparedSQLUpdateActionImpl(this, sql, params).execute(null); } @Override - public List executeSQLBatch(String sql, Iterable paramsBatch) { + public List executeSQLBatch(String sql, Iterable paramsBatch) { return new PreparedSQLBatchUpdateActionImpl(this, sql) .setAllParams(paramsBatch) .execute(null);