[v0.3.0] 添加测试项目，并对新内容进行测试

.github/gpg_public.key

@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+OK7d0W/LdJ3iFeselROADHgPQn14sg==
+=rRA5
+-----END PGP PUBLIC KEY BLOCK-----

easysql-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLAction.java

@@ -106,6 +106,7 @@ default <R> R execute(@NotNull SQLFunction<T, R> function,
 	 * 执行语句并处理返回值
 	 *
 	 * @param function         处理方法
+	 * @param defaultResult    默认结果，若处理后的结果为null，则返回该值
 	 * @param exceptionHandler 异常处理器 默认为 {@link #defaultExceptionHandler()}
 	 * @param <R>              需要返回的内容
 	 * @return 指定类型数据
@@ -139,8 +140,8 @@ default <R> R executeFunction(@NotNull SQLFunction<T, R> function) throws SQLExc
 	/**
 	 * 执行语句并处理返回值
 	 *
-	 * @param defaultResult 默认结果，若处理后的结果为null，则返回该值
 	 * @param function      处理方法
+	 * @param defaultResult 默认结果，若处理后的结果为null，则返回该值
 	 * @param <R>           需要返回的内容
 	 * @return 指定类型数据
 	 * @throws SQLException 当SQL操作出现问题时抛出

easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java

@@ -113,9 +113,9 @@ default void setDebugMode(boolean enable) {
 	 * 对库中的某个表执行更改
 	 *
 	 * @param tableName 表名
-	 * @return {@link TableAlertBuilder}
+	 * @return {@link TableAlterBuilder}
 	 */
-	TableAlertBuilder alterTable(@NotNull String tableName);
+	TableAlterBuilder alterTable(@NotNull String tableName);
 
 	/**
 	 * 新建一个查询

easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/TableAlertBuilder.java → easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/TableAlterBuilder.java

@@ -8,7 +8,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public interface TableAlertBuilder extends SQLBuilder {
+public interface TableAlterBuilder extends SQLBuilder {
 
 	SQLAction<Integer> renameTo(@NotNull String newTableName);
 
@@ -23,22 +23,22 @@ SQLAction<Integer> addIndex(@NotNull IndexType indexType, @NotNull String indexN
 	 * 为该表移除一个索引
 	 *
 	 * @param indexName 索引名
-	 * @return @return {@link SQLUpdateAction}
+	 * @return {@link SQLUpdateAction}
 	 */
 	SQLAction<Integer> dropIndex(@NotNull String indexName);
 
 	/**
 	 * 为该表移除一个外键
 	 *
 	 * @param keySymbol 外键名
-	 * @return @return {@link SQLUpdateAction}
+	 * @return {@link SQLUpdateAction}
 	 */
 	SQLAction<Integer> dropForeignKey(@NotNull String keySymbol);
 
 	/**
 	 * 为该表移除主键(须添加新主键)
 	 *
-	 * @return @return {@link SQLUpdateAction}
+	 * @return {@link SQLUpdateAction}
 	 */
 	SQLAction<Integer> dropPrimaryKey();
 
@@ -107,7 +107,7 @@ default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName, @N
 	 *
 	 * @param columnName 列名
 	 * @param numberType 数字类型，若省缺则为 {@link NumberType#INT}
-	 * @return {@link TableAlertBuilder}
+	 * @return {@link TableAlterBuilder}
 	 */
 	default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName, @NotNull NumberType numberType) {
 		return addAutoIncrementColumn(columnName, numberType, false, true);
@@ -120,7 +120,7 @@ default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName, @N
 	 * <p> 注意：一个表只允许有一个自增列！
 	 *
 	 * @param columnName 列名
-	 * @return {@link TableAlertBuilder}
+	 * @return {@link TableAlterBuilder}
 	 */
 	default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName) {
 		return addAutoIncrementColumn(columnName, NumberType.INT);

easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/TableCreateBuilder.java

@@ -84,45 +84,54 @@ default TableCreateBuilder addColumn(@NotNull String columnName, @NotNull String
 	 * <p> 自增列强制要求为数字类型，非空，且为UNIQUE。
 	 * <p> 注意：一个表只允许有一个自增列！
 	 *
-	 * @param columnName 列名
-	 * @param numberType 数字类型，若省缺则为 {@link NumberType#INT}
-	 * @param primary    是否为主键，若为false则设定为唯一键
-	 * @param unsigned   是否采用 UNSIGNED (即无负数，可以增加自增键的最高数，建议为true)
+	 * @param columnName   列名
+	 * @param numberType   数字类型，若省缺则为 {@link NumberType#INT}
+	 * @param asPrimaryKey 是否为主键，若为false则设定为唯一键
+	 * @param unsigned     是否采用 UNSIGNED (即无负数，可以增加自增键的最高数，建议为true)
 	 * @return {@link TableCreateBuilder}
 	 */
-	default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType,
-													  boolean primary, boolean unsigned) {
-		return addColumn(columnName,
-				(numberType == null ? NumberType.INT : numberType).name()
-						+ (unsigned ? " UNSIGNED " : " ")
-						+ "NOT NULL AUTO_INCREMENT " + (primary ? "PRIMARY KEY" : "UNIQUE KEY")
-		);
+	TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType,
+											  boolean asPrimaryKey, boolean unsigned);
+
+	/**
+	 * 为该表添加一个INT类型的自增主键列
+	 * <p> 自增列强制要求为数字类型，非空，且为UNIQUE。
+	 * <p> 注意：一个表只允许有一个自增列！
+	 *
+	 * @param columnName   列名
+	 * @param asPrimaryKey 是否为主键，若为false则设定为唯一键
+	 * @param unsigned     是否采用 UNSIGNED (即无负数，可以增加自增键的最高数，建议为true)
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName,
+													  boolean asPrimaryKey, boolean unsigned) {
+		return addAutoIncrementColumn(columnName, NumberType.INT, asPrimaryKey, unsigned);
 	}
 
+
 	/**
-	 * 为该表添加一个自增主键列
+	 * 为该表添加一个INT类型的自增列
 	 * <p> 自增列强制要求为数字类型，非空，且为UNIQUE。
 	 * <p> 注意：一个表只允许有一个自增列！
 	 *
-	 * @param columnName 列名
-	 * @param numberType 数字类型，若省缺则为 {@link NumberType#INT}
+	 * @param columnName   列名
+	 * @param asPrimaryKey 是否为主键，若为false则设定为唯一键
 	 * @return {@link TableCreateBuilder}
 	 */
-	default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType) {
-		return addAutoIncrementColumn(columnName, numberType, true, true);
+	default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName, boolean asPrimaryKey) {
+		return addAutoIncrementColumn(columnName, asPrimaryKey, true);
 	}
 
 	/**
 	 * 为该表添加一个INT类型的自增主键列
 	 * <p> 自增列强制要求为数字类型，非空，且为UNIQUE。
-	 * <p> 本方法采用的类型为 INT 如有其他需要请自行使用 {@link #addAutoIncrementColumn(String, NumberType)} 方法。
 	 * <p> 注意：一个表只允许有一个自增列！
 	 *
 	 * @param columnName 列名
 	 * @return {@link TableCreateBuilder}
 	 */
 	default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName) {
-		return addAutoIncrementColumn(columnName, null);
+		return addAutoIncrementColumn(columnName, true);
 	}
 
 	/**
@@ -136,8 +145,8 @@ default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName) {
 	 * @param columnName 索引包含的列
 	 * @return {@link TableCreateBuilder}
 	 */
-	default TableCreateBuilder setIndex(@NotNull IndexType type,
-										@NotNull String columnName) {
+	default TableCreateBuilder setIndex(@NotNull String columnName,
+										@NotNull IndexType type) {
 		return setIndex(type, null, columnName);
 	}
 

easysql-impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/TableAlterBuilderImpl.java

@@ -2,14 +2,14 @@
 
 import cc.carm.lib.easysql.action.SQLUpdateActionImpl;
 import cc.carm.lib.easysql.api.SQLAction;
-import cc.carm.lib.easysql.api.builder.TableAlertBuilder;
+import cc.carm.lib.easysql.api.builder.TableAlterBuilder;
 import cc.carm.lib.easysql.api.enums.IndexType;
 import cc.carm.lib.easysql.builder.AbstractSQLBuilder;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAlertBuilder {
+public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAlterBuilder {
 
 	protected final @NotNull String tableName;
 
@@ -25,92 +25,102 @@ public TableAlterBuilderImpl(@NotNull SQLManagerImpl manager, @NotNull String ta
 	@Override
 	public SQLAction<Integer> renameTo(@NotNull String newTableName) {
 		return new SQLUpdateActionImpl(getManager(),
-				"ALERT TABLE `" + getTableName() + "` RENAME TO `" + newTableName + "`"
+				"ALTER TABLE `" + getTableName() + "` RENAME TO `" + newTableName + "`"
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> changeComment(@NotNull String newTableComment) {
 		return new SQLUpdateActionImpl(getManager(),
-				"ALERT TABLE `" + getTableName() + "` COMMENT '" + newTableComment + "'"
+				"ALTER TABLE `" + getTableName() + "` COMMENT '" + newTableComment + "'"
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> setAutoIncrementIndex(int index) {
 		return new SQLUpdateActionImpl(getManager(),
-				"ALERT TABLE `" + getTableName() + "` AUTO_INCREMENT=" + index
+				"ALTER TABLE `" + getTableName() + "` AUTO_INCREMENT=" + index
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> addIndex(@NotNull IndexType indexType, @NotNull String indexName, @NotNull String columnName, @NotNull String... moreColumns) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` ADD "
+				"ALTER TABLE `" + getTableName() + "` ADD "
 						+ TableCreateBuilderImpl.buildIndexSettings(indexType, indexName, columnName, moreColumns)
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> dropIndex(@NotNull String indexName) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` DROP INDEX `" + indexName + "`"
+				"ALTER TABLE `" + getTableName() + "` DROP INDEX `" + indexName + "`"
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> dropForeignKey(@NotNull String keySymbol) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` DROP FOREIGN KEY `" + keySymbol + "`"
+				"ALTER TABLE `" + getTableName() + "` DROP FOREIGN KEY `" + keySymbol + "`"
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> dropPrimaryKey() {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` DROP PRIMARY KEY"
+				"ALTER TABLE `" + getTableName() + "` DROP PRIMARY KEY"
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn) {
+		String orderSettings = null;
+		if (afterColumn != null) {
+			if (afterColumn.length() > 0) {
+				orderSettings = "AFTER `" + afterColumn + "`";
+			} else {
+				orderSettings = "FIRST";
+			}
+		}
+
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` ADD `" + columnName + "` " + settings
+				"ALTER TABLE `" + getTableName() + "` ADD `" + columnName + "` " + settings
+						+ (orderSettings != null ? " " + orderSettings : "")
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> renameColumn(@NotNull String columnName, @NotNull String newName) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` RENAME COLUMN `" + columnName + "` TO `" + newName + "`"
+				"ALTER TABLE `" + getTableName() + "` RENAME COLUMN `" + columnName + "` TO `" + newName + "`"
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> modifyColumn(@NotNull String columnName, @NotNull String settings) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` MODIFY COLUMN `" + columnName + "` " + settings
+				"ALTER TABLE `" + getTableName() + "` MODIFY COLUMN `" + columnName + "` " + settings
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> removeColumn(@NotNull String columnName) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` DROP `" + columnName + "`"
+				"ALTER TABLE `" + getTableName() + "` DROP `" + columnName + "`"
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> setColumnDefault(@NotNull String columnName, @NotNull String defaultValue) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` ALERT `" + columnName + "` SET DEFAULT " + defaultValue
+				"ALTER TABLE `" + getTableName() + "` ALTER `" + columnName + "` SET DEFAULT " + defaultValue
 		);
 	}
 
 	@Override
 	public SQLAction<Integer> removeColumnDefault(@NotNull String columnName) {
 		return createAction(
-				"ALERT TABLE `" + getTableName() + "` ALERT `" + columnName + "` DROP DEFAULT"
+				"ALTER TABLE `" + getTableName() + "` ALTER `" + columnName + "` DROP DEFAULT"
 		);
 	}