[0.3.5] 修复 ConditionalBuilder 对于参数未添加 AND 链接的问题

Bump maven-gpg-plugin from 1.6 to 3.0.1

.github/ISSUE_TEMPLATE/bugs_report.md

@@ -1,6 +1,9 @@
 ---
-name: 问题提交 about: 描述问题并提交，帮助我们对其进行检查与修复。 title: ''
-labels: bug assignees: ''
+name: 问题提交 
+about: 描述问题并提交，帮助我们对其进行检查与修复。 
+title: ''
+labels: bug 
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/feature_issues.md

@@ -1,7 +1,9 @@
 ---
-name: 功能需求 about: 希望我们提供更多的功能。 title: ''
-labels: enhancement assignees: ''
-
+name: 功能需求 
+about: 希望我们提供更多的功能。 
+title: ''
+labels: enhancement 
+assignees: ''
 ---
 
 ### **功能简述**

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/gpg_public.key

@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGHwDt0BDAC+2u7hHXIp+C3tvUc5w7Ga5gDVNN3xTQEurGXgYSnGnNPb89h/
+tk6MBQ2AHdsj61yK/mH65RbDZe725+0zBvumxfrPbgqYBy9veE1Cjpl3wJwsGYa+
+gidq3tU2WBpUpaFOcyfxzvoDjKv6BClX+m7RijRM4tTSxmzrUTfwrClSdSV2HlBu
+AuKvY5W+cDwlKtuXEBtgCpdlOGsp8YZsqe4QD9xMI6GOOnXnHisYnmsMzn2RU8mW
+GUS3ob1J1vAfIinixwB8tHlxB/G3jaOXtQEwFmI2dfYOdkbxOiIgcSfbRI8PGiHA
+KiluZpn+Ww05GwUch2HdX8dw1hsbWM4G/X8Aqy3HdJB28p73dE4I9FRrJ1uxsmMe
+iON8QevhSBC0qwSxb+16vKt58ErQnqXrJI6+HzPldn22OQIF7bMZGwYkZiOjS5LU
+xAoRT4Jomks0ccOZGe7wMIUp2Ch22vmv4O78Pd2GEzAcTUvM8mrS+zJBMogjx27C
+r86HOWEjmi2R32EAEQEAAbQeQ2FybSBKb3MgPEthcm11bkpAb3V0bG9vay5jb20+
+iQHUBBMBCAA+FiEEL6NL2WG27xbAlAIkh337tzeYbfcFAmHwDt0CGwMFCQPCZwAF
+CwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQh337tzeYbffNvQwAscXykUimCOli
+lRK52P6+w5n/arl7UxCh7TZiRjf9feiCp3OivETKCeqnbtNTgv67aNbxjO9asCTK
+dU6J6Zh6wO8CqDhg+EA8qn+Nu4ESPGvgyWyeck9otMy16To5/I9eQRYTOos1crOA
+DRUH1MWLeIkZabM6wSPad/CcRAzFNf5+8JNuQqCgQ3Rngst1Z6Gyb1hixWnjxc4P
+7dFquwbR0D0ojwj0Etqd0c5p0iwyRl2I2QQ1bS3aGqdW0LzM9ixh25HAReg2QH7G
+FBQ5PLLXr4UqYQygzwhUtxl2jra0+3ia+D7OBwlgm3QPnlo82Z7nExQUYmemD7jV
+3Gc1ELXKSRHKbVjSoGiHWpnSiw4ptLo+tnzhRCHlV+pTS3IbQoPdb/glBOVIkA/j
+ksCfbrmC8aXpk1YycAXY2my7BpXsImWAOwPHVsvcB2IpEA2s3VfsZ/IB9z+yih3n
+z8mL0BFjKWUV23IOoeRqmt7l8nB7u55Nbjasu0LdTcl2R6swE3fTuQGNBGHwDt0B
+DAChLPfZ1njctL8BijLO//Hgvw9E6STJGYgqglNetfdoir+YAwCPQ32K4MsaQKl8
+xQelmcOU+5jO2C8wEyNAjmvyKGB2J/IjLEtAlbOn1UltKQ/GhxgMjg0EheY81ZMa
+7FDq1TDwYRCN5SMKhl5GF0JJ4OWfg1i7HbpEfkw4mW1pl0/eNdeQaC6qV6EWTsqz
+WRbi8DeH1WarSgq/00Za6zxNntLNLoq7jsTbDwTc6pgOp1Z8EcGfI/mcn3moqTxc
+o/PLYg+6impCKXVeRUlgGBpJ5YVvR5ACTLS9Tztwho9MpKJ9obXAfwXKyoToHCII
++pTnuzweOfOsrjLsFySnXq8WO2PY9JbNWjveKfk35fGfsrbwU0Vg+m67UahXqA4i
+KNvZeA8bG8AXrxUirKLWIj/8AuW8NAKu7ui4YmexldraYUgaoBrqhXZCVe8dNQv+
+erzNbmJUCPDauNddnDsCqOoZ8fWyBenDs3NS0TWuvua4/ND+AyVxPeatI4qfS2TD
+gnUAEQEAAYkBvAQYAQgAJhYhBC+jS9lhtu8WwJQCJId9+7c3mG33BQJh8A7dAhsM
+BQkDwmcAAAoJEId9+7c3mG33znkL/01lWSQOzFd+omzrz0RPqFUksxqQS+CUty0m
+/4n9H/K3BLcut+nUNbosNuqPqISoiaV7BGigv0bT+Pu+EQQtyjYOSeibeBadB48w
+cYp8k3YJbfinuKApw1Zp9IfAd3eXXWi30OY4FmlsKy6LGnusZ6KS+FzTjU94yN/0
+LK05fmBtLN/MQJQyqYIkquzk//diwpsxnv34+10igYaQBAEpPIsmsYwWg+ecCtyx
+lJGvmQggBrKvo5EdOGhO9DJAu1WQcFqnUCj5qvL+YKIsMyIwujQH8554P8xfCLFU
+a351qs30yWXX4HGMn3o7RuVQAACs1buxlMen/JEdQOLOaUtFcu2iYzCFhuzDsetc
+geNinFyo0bV9dXiahG95oTL45OA0w+E9Y0B5VXc9Yf08Yyj8ayMChASfVG5lZU6l
+KhiaKHV9t4xmwP43lRjs8HTC5rtXc31kPtOAT61HG9vPA49ZdXybUqoHru15PFmc
+OK7d0W/LdJ3iFeselROADHgPQn14sg==
+=rRA5
+-----END PGP PUBLIC KEY BLOCK-----

.github/workflows/deploy.yml

@@ -11,7 +11,8 @@ on:
     types: [ published ]
 
 jobs:
-  deploy:
+  gh-deploy:
+    name: "Publish Project (GitHub)"
     runs-on: ubuntu-latest
 
     steps:
@@ -25,12 +26,15 @@ jobs:
           server-id: github
           server-username: MAVEN_USERNAME
           server-password: MAVEN_TOKEN
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: "Maven Deploy With Javadoc"
-        run: mvn -B deploy --file pom.xml -DskipTests
+        run: mvn -B -Pgithub deploy --file pom.xml -DskipTests
         env:
           MAVEN_USERNAME: ${{ github.repository_owner }}
           MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: "Copy Javadoc to Location"
         run: |
@@ -77,3 +81,28 @@ jobs:
         run: |
           cd docs
           git push origin HEAD:gh-pages --force
+
+  central-deploy:
+    name: "Deploy Project (Central Repository)"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: "Set up JDK"
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: maven
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+
+      - name: "Central Deploy"
+        run: mvn -B -Possrh deploy --file pom.xml -DskipTests
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASS }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

.github/workflows/sonar-analyze.yml

@@ -1,36 +0,0 @@
-name: "Sonar Analyze"
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [ opened, synchronize, reopened ]
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Maven packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=CarmJos_EasySQL

README.md

@@ -35,7 +35,7 @@
 
 ### 示例代码
 
-您可以 [点击这里](easysql-demo/src/main/java/EasySQLDemo.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。
+您可以 [点击这里](example/easysql-demo/src/main/java/EasySQLDemo.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。
 
 ### 依赖方式
 
@@ -48,8 +48,16 @@
 
 <project>
     <repositories>
+
         <repository>
-            <!--采用github依赖库，安全稳定，但需要配置 (推荐)-->
+            <!--采用Maven中心库，安全稳定，但版本更新需要等待同步-->
+            <id>maven</id>
+            <name>Maven Central</name>
+            <url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
+        </repository>
+        
+        <repository>
+            <!--采用github依赖库，实时更新，但需要配置 (推荐) -->
             <id>EasySQL</id>
             <name>GitHub Packages</name>
             <url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
@@ -130,7 +138,11 @@
 
 ```groovy
 repositories {
-    // 采用github依赖库，安全稳定，但需要配置 (推荐)
+
+    // 采用Maven中心库，安全稳定，但版本更新需要等待同步 
+    mavenCentral()
+    
+    // 采用github依赖库，实时更新，但需要配置 (推荐)
     maven { url 'https://maven.pkg.github.com/CarmJos/EasySQL' }
 
     // 采用我的私人依赖库，简单方便，但可能因为变故而无法使用

easysql-api/pom.xml

@@ -5,14 +5,21 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.2.9</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-api</artifactId>
     <packaging>jar</packaging>
 
-    <name>00-EasySQL-API</name>
+    <name>EasySQL-API</name>
     <description>EasySQL的接口部分。用于打包到公共项目的API中，避免项目过大。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -37,27 +44,16 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-    </properties>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -70,6 +66,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

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

@@ -3,13 +3,14 @@ package cc.carm.lib.easysql.api;
 import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
 import cc.carm.lib.easysql.api.function.SQLFunction;
 import cc.carm.lib.easysql.api.function.SQLHandler;
-import cc.carm.lib.easysql.api.function.impl.DefaultSQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.defaults.DefaultSQLExceptionHandler;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.sql.SQLException;
-import java.util.Optional;
 import java.util.UUID;
+import java.util.logging.Logger;
 
 /**
  * SQLAction 是用于承载SQL语句并进行处理、返回的基本类。
@@ -22,7 +23,8 @@ import java.util.UUID;
  *     <li>异步执行 {@link #executeAsync(SQLHandler, SQLExceptionHandler)}
  *     <br>异步执行时将提供成功与异常两种处理方式
  *     <br>可自行选择是否对数据或异常进行处理
- *     <br>默认的异常处理器为 {@link #defaultExceptionHandler()}</li>
+ *     <br>默认的异常处理器为 {@link #defaultExceptionHandler()}
+ *     <br>若有特殊需要，可通过{@link #setExceptionHandler(SQLExceptionHandler)} 方法修改默认的处理器</li>
  * </ul>
  *
  * @param <T> 需要返回的类型
@@ -97,8 +99,25 @@ public interface SQLAction<T> {
 	@Nullable
 	default <R> R execute(@NotNull SQLFunction<T, R> function,
 	                      @Nullable SQLExceptionHandler exceptionHandler) {
+		return execute(function, null, exceptionHandler);
+	}
+
+	/**
+	 * 执行语句并处理返回值
+	 *
+	 * @param function         处理方法
+	 * @param defaultResult    默认结果，若处理后的结果为null，则返回该值
+	 * @param exceptionHandler 异常处理器 默认为 {@link #defaultExceptionHandler()}
+	 * @param <R>              需要返回的内容
+	 * @return 指定类型数据
+	 */
+	@Nullable
+	@Contract("_,!null,_ -> !null")
+	default <R> R execute(@NotNull SQLFunction<T, R> function,
+	                      @Nullable R defaultResult,
+	                      @Nullable SQLExceptionHandler exceptionHandler) {
 		try {
-			return executeFunction(function);
+			return executeFunction(function, defaultResult);
 		} catch (SQLException exception) {
 			handleException(exceptionHandler, exception);
 			return null;
@@ -114,10 +133,26 @@ public interface SQLAction<T> {
 	 * @throws SQLException 当SQL操作出现问题时抛出
 	 */
 	@Nullable
-	default <R> R executeFunction(@NotNull SQLFunction<T, R> function) throws SQLException {
+	default <R> R executeFunction(@NotNull SQLFunction<@NotNull T, R> function) throws SQLException {
+		return executeFunction(function, null);
+	}
+
+	/**
+	 * 执行语句并处理返回值
+	 *
+	 * @param function      处理方法
+	 * @param defaultResult 默认结果，若处理后的结果为null，则返回该值
+	 * @param <R>           需要返回的内容
+	 * @return 指定类型数据
+	 * @throws SQLException 当SQL操作出现问题时抛出
+	 */
+	@Nullable
+	@Contract("_,!null -> !null")
+	default <R> R executeFunction(@NotNull SQLFunction<@NotNull T, R> function,
+	                              @Nullable R defaultResult) throws SQLException {
 		try {
-			T value = execute();
-			return function.apply(value);
+			R result = function.apply(execute());
+			return result == null ? defaultResult : result;
 		} catch (SQLException exception) {
 			throw new SQLException(exception);
 		}
@@ -154,11 +189,13 @@ public interface SQLAction<T> {
 	}
 
 	/**
-	 * @return 默认的异常处理器
+	 * 默认的异常处理器
+	 *
+	 * @return {@link DefaultSQLExceptionHandler#get(Logger)}
+	 * @see DefaultSQLExceptionHandler
 	 */
 	default SQLExceptionHandler defaultExceptionHandler() {
-		return Optional.ofNullable(DefaultSQLExceptionHandler.getCustomHandler())
-				.orElse(new DefaultSQLExceptionHandler(getManager()));
+		return DefaultSQLExceptionHandler.get(getManager().getLogger());
 	}
 
 	/**

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

@@ -18,4 +18,15 @@ public interface SQLBuilder {
 	 */
 	@NotNull SQLManager getManager();
 
+
+	static @NotNull String withBackQuote(@NotNull String str) {
+		str = str.trim();
+		return str.startsWith("`") && str.endsWith("`") ? str : "`" + str + "`";
+	}
+
+	static @NotNull String withQuote(@NotNull String str) {
+		str = str.trim();
+		return str.startsWith("'") && str.endsWith("'") ? str : "'" + str + "'";
+	}
+
 }

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

@@ -109,6 +109,14 @@ public interface SQLManager {
 	 */
 	TableCreateBuilder createTable(@NotNull String tableName);
 
+	/**
+	 * 对库中的某个表执行更改
+	 *
+	 * @param tableName 表名
+	 * @return {@link TableAlterBuilder}
+	 */
+	TableAlterBuilder alterTable(@NotNull String tableName);
+
 	/**
 	 * 新建一个查询
 	 *

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

@@ -1,6 +1,5 @@
 package cc.carm.lib.easysql.api;
 
-import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.action.query.PreparedQueryAction;
 import cc.carm.lib.easysql.api.action.query.QueryAction;
 
@@ -43,6 +42,7 @@ public interface SQLQuery extends AutoCloseable {
 	/**
 	 * 关闭所有内容
 	 */
+	@Override
 	void close();
 
 	Statement getStatement();

easysql-api/src/main/java/cc/carm/lib/easysql/api/action/PreparedSQLUpdateBatchAction.java

@@ -29,16 +29,27 @@ public interface PreparedSQLUpdateBatchAction extends SQLAction<List<Integer>> {
 	 *                       <br>若该值 ＞ 0，则 {@link #execute()} 返回自增主键数值
 	 *                       <br>若该值 ≤ 0，则 {@link #execute()} 返回变更的行数
 	 * @return {@link PreparedSQLUpdateBatchAction}
+	 * @see #setReturnGeneratedKeys(boolean)
 	 */
-    PreparedSQLUpdateBatchAction setKeyIndex(int keyColumnIndex);
+	@Deprecated
+	default PreparedSQLUpdateBatchAction setKeyIndex(int keyColumnIndex) {
+		return setReturnGeneratedKeys(keyColumnIndex > 0);
+	}
 
 	/**
-     * 默认主键序列的数值为 -1 (≤0) ，即默认返回发生变更的行数。
+	 * 设定该操作返回自增键序列。
 	 *
-     * @return 默认主键序列
+	 * @return {@link PreparedSQLUpdateBatchAction}
 	 */
-    default PreparedSQLUpdateBatchAction defaultKeyIndex() {
-        return setKeyIndex(-1); // will return changed lines number
+	default PreparedSQLUpdateBatchAction returnGeneratedKeys() {
+		return setReturnGeneratedKeys(true);
 	}
 
+	/**
+	 * 设定该操作是否返回自增键序列。
+	 *
+	 * @return {@link PreparedSQLUpdateBatchAction}
+	 */
+	PreparedSQLUpdateBatchAction setReturnGeneratedKeys(boolean returnGeneratedKey);
+
 }

easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateAction.java

@@ -11,17 +11,27 @@ public interface SQLUpdateAction extends SQLAction<Integer> {
 	 *                       <br>若该值 ＞ 0，则 {@link #execute()} 返回自增主键数值
 	 *                       <br>若该值 ≤ 0，则 {@link #execute()} 返回变更的行数
 	 * @return {@link SQLUpdateAction}
+	 * @see #setReturnGeneratedKey(boolean)
 	 */
-    SQLUpdateAction setKeyIndex(int keyColumnIndex);
+	@Deprecated
+	default SQLUpdateAction setKeyIndex(int keyColumnIndex) {
+		return setReturnGeneratedKey(keyColumnIndex > 0);
+	}
 
 	/**
-     * 默认主键序列的数值为 -1 (≤0) ，即默认返回发生变更的行数。
+	 * 设定该操作返回自增键序列。
 	 *
-     * @return 默认主键序列
+	 * @return {@link SQLUpdateAction}
 	 */
-    default SQLUpdateAction defaultKeyIndex() {
-        return setKeyIndex(-1); // will return changed lines number
+	default SQLUpdateAction returnGeneratedKey() {
+		return setReturnGeneratedKey(true);
 	}
 
+	/**
+	 * 设定该操作是否返回自增键序列。
+	 *
+	 * @return {@link SQLUpdateAction}
+	 */
+	SQLUpdateAction setReturnGeneratedKey(boolean returnGeneratedKey);
 
 }

easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java

@@ -1,7 +1,6 @@
 package cc.carm.lib.easysql.api.action;
 
 import cc.carm.lib.easysql.api.SQLAction;
-import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -16,20 +15,11 @@ public interface SQLUpdateBatchAction extends SQLAction<List<Integer>> {
 	 */
 	SQLUpdateBatchAction addBatch(@NotNull String sql);
 
+	@Override
+	default @NotNull String getSQLContent() {
+		return getSQLContents().get(0);
+	}
+
 	List<String> getSQLContents();
 
-	@Override
-	default SQLExceptionHandler defaultExceptionHandler() {
-		return (exception, action) -> {
-			getManager().getLogger().severe("Error when execute SQLs : ");
-			int i = 1;
-			for (String content : getSQLContents()) {
-				getManager().getLogger().severe("#" + i + " [" + content + "]");
-				i++;
-			}
-			getManager().getLogger().severe(exception.getLocalizedMessage());
-			exception.printStackTrace();
-		};
-	}
-
 }

easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/QueryAction.java

@@ -5,6 +5,7 @@ import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
 import cc.carm.lib.easysql.api.function.SQLFunction;
 import cc.carm.lib.easysql.api.function.SQLHandler;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,19 +32,13 @@ import java.sql.SQLException;
  */
 public interface QueryAction extends SQLAction<SQLQuery> {
 
-	/**
-	 * 执行语句并处理返回值
-	 *
-	 * @param function 处理方法
-	 * @param <R>      需要返回的内容
-	 * @return 指定类型数据
-	 * @throws SQLException 当SQL操作出现问题时抛出
-	 */
-	@Nullable
-	default <R> R executeFunction(@NotNull SQLFunction<SQLQuery, R> function)
-			throws SQLException {
+	@Override
+	@Contract("_,!null -> !null")
+	default <R> @Nullable R executeFunction(@NotNull SQLFunction<@NotNull SQLQuery, R> function,
+	                                        @Nullable R defaultResult) throws SQLException {
 		try (SQLQuery value = execute()) {
-			return function.apply(value);
+			R result = function.apply(value);
+			return result == null ? defaultResult : result;
 		} catch (SQLException exception) {
 			throw new SQLException(exception);
 		}

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

@@ -1,5 +1,6 @@
 package cc.carm.lib.easysql.api.builder;
 
+import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.SQLBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -7,10 +8,21 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Date;
 import java.util.LinkedHashMap;
 
-public interface ConditionalBuilder<B extends ConditionalBuilder<B, T>, T> extends SQLBuilder {
+public interface ConditionalBuilder<B extends ConditionalBuilder<B, T>, T extends SQLAction<?>> extends SQLBuilder {
 
+	/**
+	 * 将现有条件构建完整的SQL语句用于执行。
+	 *
+	 * @return {@link cc.carm.lib.easysql.api.SQLAction}
+	 */
 	T build();
 
+	/**
+	 * 设定取出的条数
+	 *
+	 * @param limit 条数限制
+	 * @return {@link B}
+	 */
 	B setLimit(int limit);
 
 	B setConditions(@Nullable String condition);

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

@@ -1,8 +1,8 @@
 package cc.carm.lib.easysql.api.builder;
 
-import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
+import cc.carm.lib.easysql.api.SQLAction;
 
-public interface DeleteBuilder extends ConditionalBuilder<DeleteBuilder, PreparedSQLUpdateAction> {
+public interface DeleteBuilder extends ConditionalBuilder<DeleteBuilder, SQLAction<Integer>> {
 
 	String getTableName();
 

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

@@ -1,9 +1,11 @@
 package cc.carm.lib.easysql.api.builder;
 
+import cc.carm.lib.easysql.api.SQLAction;
+
 import java.util.Arrays;
 import java.util.List;
 
-public interface InsertBuilder<T> {
+public interface InsertBuilder<T extends SQLAction<?>> {
 
     String getTableName();
 

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

@@ -1,9 +1,18 @@
 package cc.carm.lib.easysql.api.builder;
 
+import cc.carm.lib.easysql.api.SQLAction;
+
 import java.util.Arrays;
 import java.util.List;
 
-public interface ReplaceBuilder<T> {
+/**
+ * REPLACE 语句用于将一组值更新进数据表中。
+ * <br> 执行后，将通过表中键判断该数据是否存在，若存在则用新数据替换原来的值，若不存在则会插入该数据。
+ * <br> 在使用REPLACE时，表与所给行列数据中必须包含唯一索引(或主键)，且索引不得为空值，否则将等同于插入语句。
+ *
+ * @param <T> 最终构建出的 {@link SQLAction} 类型
+ */
+public interface ReplaceBuilder<T extends SQLAction<?>> {
 
 	String getTableName();
 
@@ -13,5 +22,4 @@ public interface ReplaceBuilder<T> {
 		return setColumnNames(columnNames == null ? null : Arrays.asList(columnNames));
 	}
 
-
 }

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

@@ -0,0 +1,129 @@
+package cc.carm.lib.easysql.api.builder;
+
+import cc.carm.lib.easysql.api.SQLAction;
+import cc.carm.lib.easysql.api.SQLBuilder;
+import cc.carm.lib.easysql.api.action.SQLUpdateAction;
+import cc.carm.lib.easysql.api.enums.IndexType;
+import cc.carm.lib.easysql.api.enums.NumberType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface TableAlterBuilder extends SQLBuilder {
+
+	SQLAction<Integer> renameTo(@NotNull String newTableName);
+
+	SQLAction<Integer> changeComment(@NotNull String newTableComment);
+
+	SQLAction<Integer> setAutoIncrementIndex(int index);
+
+	SQLAction<Integer> addIndex(@NotNull IndexType indexType, @NotNull String indexName,
+								@NotNull String columnName, @NotNull String... moreColumns);
+
+	/**
+	 * 为该表移除一个索引
+	 *
+	 * @param indexName 索引名
+	 * @return {@link SQLUpdateAction}
+	 */
+	SQLAction<Integer> dropIndex(@NotNull String indexName);
+
+	/**
+	 * 为该表移除一个外键
+	 *
+	 * @param keySymbol 外键名
+	 * @return {@link SQLUpdateAction}
+	 */
+	SQLAction<Integer> dropForeignKey(@NotNull String keySymbol);
+
+	/**
+	 * 为该表移除主键(须添加新主键)
+	 *
+	 * @return {@link SQLUpdateAction}
+	 */
+	SQLAction<Integer> dropPrimaryKey();
+
+	/**
+	 * 为表添加一列
+	 *
+	 * @param columnName 列名
+	 * @param settings   列的相关设定
+	 * @return {@link SQLUpdateAction}
+	 */
+	default SQLAction<Integer> addColumn(@NotNull String columnName, @NotNull String settings) {
+		return addColumn(columnName, settings, null);
+	}
+
+	/**
+	 * 为表添加一列
+	 *
+	 * @param columnName  列名
+	 * @param settings    列的相关设定
+	 * @param afterColumn 该列增添到哪个列的后面，
+	 *                    <p> 该参数若省缺则放于最后一行
+	 *                    <p> 若为 "" 则置于首行。
+	 * @return {@link SQLUpdateAction}
+	 */
+	SQLAction<Integer> addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn);
+
+	SQLAction<Integer> renameColumn(@NotNull String columnName, @NotNull String newName);
+
+	SQLAction<Integer> modifyColumn(@NotNull String columnName, @NotNull String settings);
+
+	default SQLAction<Integer> modifyColumn(@NotNull String columnName, @NotNull String columnSettings, @NotNull String afterColumn) {
+		return modifyColumn(columnName, columnSettings + " AFTER `" + afterColumn + "`");
+	}
+
+	SQLAction<Integer> removeColumn(@NotNull String columnName);
+
+	SQLAction<Integer> setColumnDefault(@NotNull String columnName, @NotNull String defaultValue);
+
+	SQLAction<Integer> removeColumnDefault(@NotNull String columnName);
+
+	/**
+	 * 为该表添加一个自增列
+	 * <p> 自增列强制要求为数字类型，非空，且为UNIQUE。
+	 * <p> 注意：一个表只允许有一个自增列！
+	 *
+	 * @param columnName 列名
+	 * @param numberType 数字类型，若省缺则为 {@link NumberType#INT}
+	 * @param primary    是否为主键，若否则只为唯一键
+	 * @param unsigned   是否采用 UNSIGNED (即无负数，可以增加自增键的最高数，建议为true)
+	 * @return {@link TableCreateBuilder}
+	 */
+	default SQLAction<Integer> 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"),
+				""
+		);
+	}
+
+	/**
+	 * 为该表添加一个自增列
+	 * <br> 自增列强制要求为数字类型，非空，且为UNIQUE。
+	 * <p> 注意：一个表只允许有一个自增列！
+	 *
+	 * @param columnName 列名
+	 * @param numberType 数字类型，若省缺则为 {@link NumberType#INT}
+	 * @return {@link TableAlterBuilder}
+	 */
+	default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName, @NotNull NumberType numberType) {
+		return addAutoIncrementColumn(columnName, numberType, false, true);
+	}
+
+
+	/**
+	 * 为该表添加一个自增列
+	 * <br> 自增列强制要求为数字类型，非空，且为UNIQUE。
+	 * <p> 注意：一个表只允许有一个自增列！
+	 *
+	 * @param columnName 列名
+	 * @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

@@ -2,29 +2,252 @@ package cc.carm.lib.easysql.api.builder;
 
 import cc.carm.lib.easysql.api.SQLBuilder;
 import cc.carm.lib.easysql.api.action.SQLUpdateAction;
+import cc.carm.lib.easysql.api.enums.ForeignKeyRule;
+import cc.carm.lib.easysql.api.enums.IndexType;
+import cc.carm.lib.easysql.api.enums.NumberType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+import static cc.carm.lib.easysql.api.SQLBuilder.withQuote;
+
 
 public interface TableCreateBuilder extends SQLBuilder {
 
+	/**
+	 * 将现有条件构建完整的SQL语句用于执行。
+	 *
+	 * @return {@link SQLUpdateAction}
+	 */
+	SQLUpdateAction build();
+
 	@NotNull String getTableName();
 
+	/**
+	 * 得到表的设定。
+	 * <p> 若未使用 {@link #setTableSettings(String)} 方法则会采用 {@link #defaultTablesSettings()} 。
+	 *
+	 * @return TableSettings
+	 */
 	@NotNull String getTableSettings();
 
 	TableCreateBuilder setTableSettings(@NotNull String settings);
 
-    SQLUpdateAction build();
-
-    default TableCreateBuilder addColumn(@NotNull String columnName, @NotNull String settings) {
-        return addColumn("`" + columnName + "` " + settings);
-    }
-
-    TableCreateBuilder addColumn(@NotNull String column);
+	/**
+	 * 设定表的标注，一般用于解释该表的作用。
+	 *
+	 * @param comment 表标注
+	 * @return {@link TableCreateBuilder}
+	 */
+	TableCreateBuilder setTableComment(@Nullable String comment);
 
+	/**
+	 * 直接设定表的所有列信息
+	 *
+	 * @param columns 列的相关信息 (包括列设定)
+	 * @return {@link TableCreateBuilder}
+	 */
 	TableCreateBuilder setColumns(@NotNull String... columns);
 
-    default TableCreateBuilder defaultTablesSettings() {
-        return setTableSettings("ENGINE=InnoDB DEFAULT CHARSET=utf8");
+	/**
+	 * 为该表添加一个列
+	 *
+	 * @param column 列的相关信息
+	 *               <br>如 `uuid` VARCHAR(36) NOT NULL UNIQUE KEY
+	 * @return {@link TableCreateBuilder}
+	 */
+	TableCreateBuilder addColumn(@NotNull String column);
+
+	/**
+	 * 为该表添加一个列
+	 *
+	 * @param columnName 列名
+	 * @param settings   列的设定
+	 *                   <br>如 VARCHAR(36) NOT NULL UNIQUE KEY
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addColumn(@NotNull String columnName, @NotNull String settings) {
+		return addColumn(withBackQuote(columnName) + " " + settings);
+	}
+
+	/**
+	 * 为该表添加一个列
+	 *
+	 * @param columnName 列名
+	 * @param settings   列的设定
+	 *                   <br>如 VARCHAR(36) NOT NULL UNIQUE KEY
+	 * @param comments   列的注解，用于解释该列数据的作用
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addColumn(@NotNull String columnName, @NotNull String settings, @NotNull String comments) {
+		return addColumn(columnName, settings + " COMMENT " + withQuote(comments));
+	}
+
+	/**
+	 * 为该表添加一个自增列
+	 * <p> 自增列强制要求为数字类型，非空，且为UNIQUE。
+	 * <p> 注意：一个表只允许有一个自增列！
+	 *
+	 * @param columnName   列名
+	 * @param numberType   数字类型，若省缺则为 {@link NumberType#INT}
+	 * @param asPrimaryKey 是否为主键，若为false则设定为唯一键
+	 * @param unsigned     是否采用 UNSIGNED (即无负数，可以增加自增键的最高数，建议为true)
+	 * @return {@link TableCreateBuilder}
+	 */
+	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 asPrimaryKey 是否为主键，若为false则设定为唯一键
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName, boolean asPrimaryKey) {
+		return addAutoIncrementColumn(columnName, asPrimaryKey, true);
+	}
+
+	/**
+	 * 为该表添加一个INT类型的自增主键列
+	 * <p> 自增列强制要求为数字类型，非空，且为UNIQUE。
+	 * <p> 注意：一个表只允许有一个自增列！
+	 *
+	 * @param columnName 列名
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName) {
+		return addAutoIncrementColumn(columnName, true);
+	}
+
+	/**
+	 * 设定表中的某列为索引或键。
+	 *
+	 * <p>创建索引时，你需要确保该索引是应用在 SQL 查询语句的条件(一般作为 WHERE 子句的条件)。
+	 * <br>虽然索引大大提高了查询速度，同时却会降低更新表的速度，如对表进行INSERT、UPDATE 和DELETE。
+	 * <br>因此，请合理的设计索引。
+	 *
+	 * @param type       索引类型
+	 * @param columnName 索引包含的列
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder setIndex(@NotNull String columnName,
+	                                    @NotNull IndexType type) {
+		return setIndex(type, null, columnName);
+	}
+
+	/**
+	 * 设定表中的某列为索引或键。
+	 *
+	 * <p>创建索引时，你需要确保该索引是应用在 SQL 查询语句的条件(一般作为 WHERE 子句的条件)。
+	 * <br>虽然索引大大提高了查询速度，同时却会降低更新表的速度，如对表进行INSERT、UPDATE 和DELETE。
+	 * <br>因此，请合理的设计索引。
+	 *
+	 * @param type        索引类型
+	 * @param indexName   索引名称，缺省时将根据第一个索引列赋一个名称
+	 * @param columnName  索引包含的列
+	 * @param moreColumns 联合索引需要包含的列
+	 * @return {@link TableCreateBuilder}
+	 */
+	TableCreateBuilder setIndex(@NotNull IndexType type, @Nullable String indexName,
+	                            @NotNull String columnName, @NotNull String... moreColumns);
+
+
+	/**
+	 * 以本表位从表，为表中某列设定自参照外键(即自参照完整性)。
+	 *
+	 * <p>外键约束（FOREIGN KEY）是表的一个特殊字段，经常与主键约束一起使用。
+	 * <br>外键用来建立主表与从表的关联关系，为两个表的数据建立连接，约束两个表中数据的一致性和完整性。
+	 * <br>主表删除某条记录时，从表中与之对应的记录也必须有相应的改变。
+	 *
+	 * @param tableColumn   本表中的列
+	 * @param foreignColumn 外键关联表中对应的关联列，必须为目标表的主键，即 {@link IndexType#PRIMARY_KEY}
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addForeignKey(@NotNull String tableColumn, @NotNull String foreignColumn) {
+		return addForeignKey(tableColumn, getTableName(), foreignColumn);
+	}
+
+	/**
+	 * 以本表位从表，为表中某列设定外键。
+	 *
+	 * <p>外键约束（FOREIGN KEY）是表的一个特殊字段，经常与主键约束一起使用。
+	 * <br>外键用来建立主表与从表的关联关系，为两个表的数据建立连接，约束两个表中数据的一致性和完整性。
+	 * <br>主表删除某条记录时，从表中与之对应的记录也必须有相应的改变。
+	 *
+	 * @param tableColumn   本表中的列
+	 * @param foreignTable  外键关联主表，必须为已存在的表或本表，且必须有主键。
+	 * @param foreignColumn 外键关联主表中对应的关联列，须满足
+	 *                      <p> 1. 为主表的主键，即 {@link IndexType#PRIMARY_KEY}
+	 *                      <p> 2. 数据类型必须和所要建立主键的列的数据类型相同。
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addForeignKey(@NotNull String tableColumn,
+	                                         @NotNull String foreignTable, @NotNull String foreignColumn) {
+		return addForeignKey(tableColumn, null, foreignTable, foreignColumn);
+	}
+
+	/**
+	 * 以本表位从表，为表中某列设定外键。
+	 *
+	 * <p>外键约束（FOREIGN KEY）是表的一个特殊字段，经常与主键约束一起使用。
+	 * <br>外键用来建立主表与从表的关联关系，为两个表的数据建立连接，约束两个表中数据的一致性和完整性。
+	 * <br>主表删除某条记录时，从表中与之对应的记录也必须有相应的改变。
+	 *
+	 * @param tableColumn    本表中的列
+	 * @param constraintName 约束名，缺省时将使用参数自动生成，如 <i>fk_[tableColumn]_[foreignTable]</i>
+	 * @param foreignTable   外键关联主表，必须为已存在的表或本表，且必须有主键。
+	 * @param foreignColumn  外键关联主表中对应的关联列，须满足
+	 *                       <p> 1. 为主表的主键，即 {@link IndexType#PRIMARY_KEY}
+	 *                       <p> 2. 数据类型必须和所要建立主键的列的数据类型相同。
+	 * @return {@link TableCreateBuilder}
+	 */
+	default TableCreateBuilder addForeignKey(@NotNull String tableColumn, @Nullable String constraintName,
+	                                         @NotNull String foreignTable, @NotNull String foreignColumn) {
+		return addForeignKey(tableColumn, constraintName, foreignTable, foreignColumn, null, null);
+	}
+
+	/**
+	 * 以本表位从表，为表中某列设定外键。
+	 *
+	 * <p>外键约束（FOREIGN KEY）是表的一个特殊字段，经常与主键约束一起使用。
+	 * <br>外键用来建立主表与从表的关联关系，为两个表的数据建立连接，约束两个表中数据的一致性和完整性。
+	 * <br>主表删除某条记录时，从表中与之对应的记录也必须有相应的改变。
+	 *
+	 * @param tableColumn    本表中的列
+	 * @param constraintName 约束名，缺省时将使用参数自动生成，如 <i>fk_[tableColumn]_[foreignTable]</i>
+	 * @param foreignTable   外键关联主表，必须为已存在的表或本表，且必须有主键。
+	 * @param foreignColumn  外键关联主表中对应的关联列，须满足
+	 *                       <p> 1. 为主表的主键，即 {@link IndexType#PRIMARY_KEY}
+	 *                       <p> 2. 数据类型必须和所要建立主键的列的数据类型相同。
+	 * @param updateRule     在外键被更新时采用的规则，缺省时默认为{@link ForeignKeyRule#RESTRICT}
+	 * @param deleteRule     在外键被删除时采用的规则，缺省时默认为{@link ForeignKeyRule#RESTRICT}
+	 * @return {@link TableCreateBuilder}
+	 */
+	TableCreateBuilder addForeignKey(@NotNull String tableColumn, @Nullable String constraintName,
+	                                 @NotNull String foreignTable, @NotNull String foreignColumn,
+	                                 @Nullable ForeignKeyRule updateRule, @Nullable ForeignKeyRule deleteRule);
+
+	default String defaultTablesSettings() {
+		return "ENGINE=InnoDB DEFAULT CHARSET=utf8";
+	}
+
 }

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

@@ -1,10 +1,10 @@
 package cc.carm.lib.easysql.api.builder;
 
-import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
+import cc.carm.lib.easysql.api.SQLAction;
 
 import java.util.LinkedHashMap;
 
-public interface UpdateBuilder extends ConditionalBuilder<UpdateBuilder, PreparedSQLUpdateAction> {
+public interface UpdateBuilder extends ConditionalBuilder<UpdateBuilder, SQLAction<Integer>> {
 
 	String getTableName();
 

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

@@ -1,5 +1,11 @@
 package cc.carm.lib.easysql.api.builder;
 
+/**
+ * 存在则更新，不存在则插入。
+ *
+ * @see ReplaceBuilder
+ */
+@Deprecated
 public interface UpsertBuilder {
 
 	String getTableName();

easysql-api/src/main/java/cc/carm/lib/easysql/api/enums/ForeignKeyRule.java

@@ -0,0 +1,41 @@
+package cc.carm.lib.easysql.api.enums;
+
+public enum ForeignKeyRule {
+
+	/**
+	 * 啥也不做
+	 * <p>注意： 在Mysql中该选项实际上等同于采用默认的 {@link #RESTRICT} 设定！
+	 */
+	NO_ACTION("NO ACTION"),
+
+	/**
+	 * 拒绝删除要求，直到使用删除键值的辅助表被手工删除，并且没有参照时(这是默认设置，也是最安全的设置)
+	 */
+	RESTRICT("RESTRICT"),
+
+	/**
+	 * 修改包含与已删除键值有参照关系的所有记录，使用NULL值替换（只能用于已标记为NOT NULL的字段）
+	 */
+	SET_NULL("SET NULL"),
+
+	/**
+	 * 修改包含与已删除键值有参照关系的所有记录，使用默认值替换（只能用于设定了DEFAULT的字段）
+	 */
+	SET_DEFAULT("SET DEFAULT"),
+
+	/**
+	 * <b>级联删除</b>，删除包含与已删除键值有参照关系的所有记录
+	 */
+	CASCADE("CASCADE");
+
+	final String ruleName;
+
+	ForeignKeyRule(String ruleName) {
+		this.ruleName = ruleName;
+	}
+
+	public String getRuleName() {
+		return ruleName;
+	}
+
+}

easysql-api/src/main/java/cc/carm/lib/easysql/api/enums/IndexType.java

@@ -0,0 +1,41 @@
+package cc.carm.lib.easysql.api.enums;
+
+public enum IndexType {
+
+
+	/**
+	 * <b>普通索引</b>（由关键字KEY或INDEX定义的索引）的唯一任务是加快对数据的访问速度。
+	 * <br> 因此，应该只为那些最经常出现在查询条件（WHERE column=）或排序条件（ORDER BY column）中的数据列创建索引。
+	 * <br> 只要有可能，就应该选择一个数据最整齐、最紧凑的数据列（如一个整数类型的数据列）来创建索引。
+	 */
+	INDEX("INDEX"),
+
+
+	/**
+	 * <b>唯一索引</b> 是在表上一个或者多个字段组合建立的索引，这个或者这些字段的值组合起来在表中不可以重复，用于保证数据的唯一性。
+	 */
+	UNIQUE_KEY("UNIQUE KEY"),
+
+	/**
+	 * <b>主键索引</b> 是唯一索引的特定类型。表中创建主键时自动创建的索引 。一个表只能建立一个主索引。
+	 */
+	PRIMARY_KEY("PRIMARY KEY"),
+
+	/**
+	 * <b>全文索引</b> 主要用来查找文本中的关键字，而不是直接与索引中的值相比较。
+	 * <br> 请搭配 MATCH 等语句使用，而不是使用 WHERE - LIKE 。
+	 * <br> 全文索引只可用于 CHAR、 VARCHAR 与 TEXT 系列类型。
+	 */
+	FULLTEXT_INDEX("FULLTEXT");
+
+
+	final String name;
+
+	IndexType(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+}

easysql-api/src/main/java/cc/carm/lib/easysql/api/enums/NumberType.java

@@ -0,0 +1,11 @@
+package cc.carm.lib.easysql.api.enums;
+
+public enum NumberType {
+
+	TINYINT,
+	SMALLINT,
+	MEDIUMINT,
+	INT,
+	BIGINT
+
+}

easysql-api/src/main/java/cc/carm/lib/easysql/api/function/SQLExceptionHandler.java

@@ -8,4 +8,5 @@ import java.util.function.BiConsumer;
 @FunctionalInterface
 public interface SQLExceptionHandler extends BiConsumer<SQLException, SQLAction<?>> {
 	
+
 }

easysql-api/src/main/java/cc/carm/lib/easysql/api/function/SQLFunction.java

@@ -9,6 +9,6 @@ import java.sql.SQLException;
 public interface SQLFunction<T, R> {
 
 	@Nullable
-	R apply(T t) throws SQLException;
+	R apply(@NotNull T t) throws SQLException;
 
 }

easysql-api/src/main/java/cc/carm/lib/easysql/api/function/defaults/DefaultSQLExceptionHandler.java

@@ -0,0 +1,57 @@
+package cc.carm.lib.easysql.api.function.defaults;
+
+import cc.carm.lib.easysql.api.SQLAction;
+import cc.carm.lib.easysql.api.action.SQLUpdateBatchAction;
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.SQLException;
+import java.util.logging.Logger;
+
+public class DefaultSQLExceptionHandler implements SQLExceptionHandler {
+
+	private static @Nullable SQLExceptionHandler customDefaultHandler = null;
+
+	public static void setCustomHandler(@Nullable SQLExceptionHandler handler) {
+		DefaultSQLExceptionHandler.customDefaultHandler = handler;
+	}
+
+	public static @Nullable SQLExceptionHandler getCustomHandler() {
+		return customDefaultHandler;
+	}
+
+	public static @NotNull SQLExceptionHandler get(Logger logger) {
+		if (getCustomHandler() != null) return getCustomHandler();
+		else return new DefaultSQLExceptionHandler(logger);
+	}
+
+	private final Logger logger;
+
+	public DefaultSQLExceptionHandler(Logger logger) {
+		this.logger = logger;
+	}
+
+	protected Logger getLogger() {
+		return logger;
+	}
+
+	@Override
+	public void accept(SQLException exception, SQLAction<?> sqlAction) {
+		if (sqlAction instanceof SQLUpdateBatchAction) {
+
+			getLogger().severe("Error when execute SQLs : ");
+			int i = 1;
+			for (String content : ((SQLUpdateBatchAction) sqlAction).getSQLContents()) {
+				getLogger().severe("#" + i + " {" + content + "}");
+				i++;
+			}
+
+		} else {
+			getLogger().severe("Error when execute { " + sqlAction.getSQLContent() + " }");
+		}
+		exception.printStackTrace();
+	}
+
+
+}

easysql-api/src/main/java/cc/carm/lib/easysql/api/function/impl/DefaultSQLExceptionHandler.java

@@ -1,40 +0,0 @@
-package cc.carm.lib.easysql.api.function.impl;
-
-import cc.carm.lib.easysql.api.SQLAction;
-import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
-import org.jetbrains.annotations.Nullable;
-
-import java.sql.SQLException;
-
-public class DefaultSQLExceptionHandler implements SQLExceptionHandler {
-
-	private static @Nullable SQLExceptionHandler customDefaultHandler = null;
-
-	public static void setCustomHandler(@Nullable SQLExceptionHandler handler) {
-		DefaultSQLExceptionHandler.customDefaultHandler = handler;
-	}
-
-	public static @Nullable SQLExceptionHandler getCustomHandler() {
-		return customDefaultHandler;
-	}
-
-	private final SQLManager sqlManager;
-
-	public DefaultSQLExceptionHandler(SQLManager manager) {
-		this.sqlManager = manager;
-	}
-
-	protected SQLManager getManager() {
-		return sqlManager;
-	}
-
-	@Override
-	public void accept(SQLException exception, SQLAction<?> sqlAction) {
-		getManager().getLogger().severe("Error when execute [" + sqlAction.getSQLContent() + "]");
-		getManager().getLogger().severe(exception.getLocalizedMessage());
-		exception.printStackTrace();
-	}
-
-
-}

easysql-impl/pom.xml

@@ -5,14 +5,21 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.9</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-impl</artifactId>
     <packaging>jar</packaging>
 
-    <name>01-EasySQL-Impl</name>
+    <name>EasySQL-Impl</name>
     <description>EasySQL的实现部分。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -37,22 +44,14 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
     <dependencies>
 
         <dependency>
@@ -78,6 +77,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

easysql-impl/src/main/java/cc/carm/lib/easysql/action/AbstractSQLAction.java

@@ -5,10 +5,8 @@ import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
 import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.sql.SQLException;
-import java.util.Optional;
 import java.util.UUID;
 
 public abstract class AbstractSQLAction<T> implements SQLAction<T> {
@@ -20,8 +18,6 @@ public abstract class AbstractSQLAction<T> implements SQLAction<T> {
 
 	protected @NotNull String sqlContent;
 
-	protected static @Nullable SQLExceptionHandler exceptionHandler = null;
-
 	public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql) {
 		this(manager, sql, System.currentTimeMillis());
 	}
@@ -69,10 +65,11 @@ public abstract class AbstractSQLAction<T> implements SQLAction<T> {
 	}
 
 	protected void outputDebugMessage() {
-		getManager().debug("#" + getShortID() + " ->" + getSQLContent());
+		getManager().debug("# " + getShortID() + " -> { " + getSQLContent() + " }");
 	}
 
 	@Override
+	@SuppressWarnings("FutureReturnValueIgnored")
 	public void executeAsync(SQLHandler<T> success, SQLExceptionHandler failure) {
 		getManager().getExecutorPool().submit(() -> {
 			try {

easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java

@@ -18,7 +18,7 @@ public class PreparedSQLBatchUpdateActionImpl
 		extends AbstractSQLAction<List<Integer>>
 		implements PreparedSQLUpdateBatchAction {
 
-    int keyIndex = -1;
+	boolean returnKeys = false;
 	List<Object[]> allParams;
 
 	public PreparedSQLBatchUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
@@ -35,43 +35,40 @@ public class PreparedSQLBatchUpdateActionImpl
 	}
 
 	@Override
-    public PreparedSQLUpdateBatchAction addParamsBatch(Object[] params) {
+	public PreparedSQLUpdateBatchAction addParamsBatch(Object... params) {
 		this.allParams.add(params);
 		return this;
 	}
 
 	@Override
-    public PreparedSQLUpdateBatchAction setKeyIndex(int keyColumnIndex) {
-        this.keyIndex = keyColumnIndex;
+	public PreparedSQLUpdateBatchAction setReturnGeneratedKeys(boolean returnGeneratedKey) {
+		this.returnKeys = returnGeneratedKey;
 		return this;
 	}
 
 	@Override
 	public @NotNull List<Integer> execute() throws SQLException {
-        List<Integer> returnedValues;
-        Connection connection = getManager().getConnection();
-        PreparedStatement statement = StatementUtil.createPrepareStatementBatch(
-                connection, getSQLContent(), allParams, keyIndex > 0
-        );
+		try (Connection connection = getManager().getConnection()) {
+			try (PreparedStatement statement = StatementUtil.createPrepareStatementBatch(
+					connection, getSQLContent(), allParams, returnKeys
+			)) {
+
 				outputDebugMessage();
-        if (keyIndex > 0) {
-            statement.executeBatch();
-            List<Integer> generatedKeys = new ArrayList<>();
-            ResultSet resultSet = statement.getGeneratedKeys();
-            if (resultSet != null) {
-                while (resultSet.next()) generatedKeys.add(resultSet.getInt(keyIndex));
-                resultSet.close();
-            }
-            returnedValues = generatedKeys;
-        } else {
 				int[] executed = statement.executeBatch();
-            returnedValues = Arrays.stream(executed).boxed().collect(Collectors.toList());
+
+				if (!returnKeys) return Arrays.stream(executed).boxed().collect(Collectors.toList());
+				else {
+					try (ResultSet resultSet = statement.getGeneratedKeys()) {
+						List<Integer> generatedKeys = new ArrayList<>();
+						while (resultSet.next()) {
+							generatedKeys.add(resultSet.getInt(1));
+						}
+						return generatedKeys;
+					}
+				}
+			}
+
 		}
-
-        statement.close();
-        connection.close();
-
-        return returnedValues;
 	}
 
 }

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;
 	}
@@ -53,28 +53,25 @@ public class PreparedSQLUpdateActionImpl
 
 	@Override
 	public @NotNull Integer execute() throws SQLException {
-		int value = -1;
+		try (Connection connection = getManager().getConnection()) {
+
+			try (PreparedStatement statement = StatementUtil.createPrepareStatement(
+					connection, getSQLContent(), params, returnGeneratedKeys
+			)) {
 
-		Connection connection = getManager().getConnection();
-		PreparedStatement statement = StatementUtil.createPrepareStatement(
-				connection, getSQLContent(), params, keyIndex > 0
-		);
 				outputDebugMessage();
-		if (keyIndex > 0) {
-			statement.executeUpdate();
-			ResultSet resultSet = statement.getGeneratedKeys();
-			if (resultSet != null) {
-				if (resultSet.next()) value = resultSet.getInt(keyIndex);
-				resultSet.close();
-			}
-		} else {
-			value = statement.executeUpdate();
-		}
 
-		statement.close();
-		connection.close();
-
-		return value;
+				int changes = statement.executeUpdate();
+				if (!returnGeneratedKeys) return changes;
+				else {
+					try (ResultSet resultSet = statement.getGeneratedKeys()) {
+						return resultSet.next() ? resultSet.getInt(1) : -1;
+					}
+				}
+
+			}
+		}
+
 	}
 
 }

easysql-impl/src/main/java/cc/carm/lib/easysql/action/SQLUpdateActionImpl.java

@@ -13,7 +13,7 @@ public class SQLUpdateActionImpl
 		extends AbstractSQLAction<Integer>
 		implements SQLUpdateAction {
 
-    int keyIndex = -1;
+	boolean returnGeneratedKeys = false;
 
 	public SQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
 		super(manager, sql);
@@ -21,33 +21,27 @@ public class SQLUpdateActionImpl
 
 	@Override
 	public @NotNull Integer execute() throws SQLException {
-        int returnedValue = -1;
-        Connection connection = getManager().getConnection();
-        Statement statement = connection.createStatement();
+		try (Connection connection = getManager().getConnection()) {
+			try (Statement statement = connection.createStatement()) {
 				outputDebugMessage();
-        if (keyIndex > 0) {
-            statement.executeUpdate(getSQLContent(), Statement.RETURN_GENERATED_KEYS);
-            ResultSet resultSet = statement.getGeneratedKeys();
-            if (resultSet != null) {
-                if (resultSet.next()) {
-                    returnedValue = resultSet.getInt(keyIndex);
-                }
-                resultSet.close();
-            }
+
+				if (!returnGeneratedKeys) {
+					return statement.executeUpdate(getSQLContent());
 				} else {
-            returnedValue = statement.executeUpdate(getSQLContent());
+					statement.executeUpdate(getSQLContent(), Statement.RETURN_GENERATED_KEYS);
+
+					try (ResultSet resultSet = statement.getGeneratedKeys()) {
+						return resultSet.next() ? resultSet.getInt(1) : -1;
+					}
+				}
+			}
 		}
-
-        statement.close();
-        connection.close();
-
-        return returnedValue;
 	}
 
 
 	@Override
-    public SQLUpdateActionImpl setKeyIndex(int keyIndex) {
-        this.keyIndex = keyIndex;
+	public SQLUpdateAction setReturnGeneratedKey(boolean returnGeneratedKey) {
+		this.returnGeneratedKeys = returnGeneratedKey;
 		return this;
 	}
 

easysql-impl/src/main/java/cc/carm/lib/easysql/action/SQLUpdateBatchActionImpl.java

@@ -23,11 +23,6 @@ public class SQLUpdateBatchActionImpl
 		this.sqlContents.add(sql);
 	}
 
-    @Override
-    public @NotNull String getSQLContent() {
-        return this.sqlContents.get(0);
-    }
-
 	@Override
 	public @NotNull List<String> getSQLContents() {
 		return this.sqlContents;
@@ -41,18 +36,29 @@ public class SQLUpdateBatchActionImpl
 
 	@Override
 	public @NotNull List<Integer> execute() throws SQLException {
-        Connection connection = getManager().getConnection();
-        Statement statement = connection.createStatement();
+		try (Connection connection = getManager().getConnection()) {
+
+			try (Statement statement = connection.createStatement()) {
 				outputDebugMessage();
+
 				for (String content : this.sqlContents) {
 					statement.addBatch(content);
 				}
+
 				int[] executed = statement.executeBatch();
-        List<Integer> returnedValues = Arrays.stream(executed).boxed().collect(Collectors.toList());
 
-        statement.close();
-        connection.close();
+				return Arrays.stream(executed).boxed().collect(Collectors.toList());
+			}
 
-        return returnedValues;
 		}
 	}
+
+	@Override
+	protected void outputDebugMessage() {
+		getManager().debug("# " + getShortID() + " -> [");
+		for (String content : getSQLContents()) getManager().debug(" { " + content + " }");
+		getManager().debug("]");
+
+	}
+
+}

easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/PreparedQueryActionImpl.java

@@ -9,7 +9,6 @@ import org.jetbrains.annotations.Nullable;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +24,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;
 	}
@@ -50,18 +49,38 @@ public class PreparedQueryActionImpl extends QueryActionImpl implements Prepared
 
 	@Override
 	public @NotNull SQLQueryImpl execute() throws SQLException {
+		outputDebugMessage();
+
 		Connection connection = getManager().getConnection();
-		getManager().debug("#" + getShortID() + " ->" + getSQLContent());
 		PreparedStatement preparedStatement;
+		try {
 			if (handler == null) {
 				preparedStatement = StatementUtil.createPrepareStatement(connection, getSQLContent(), this.params);
 			} else {
 				preparedStatement = connection.prepareStatement(getSQLContent());
 				handler.accept(preparedStatement);
 			}
+		} catch (SQLException exception) {
+			connection.close();
+			throw exception;
+		}
 
-		ResultSet resultSet = preparedStatement.executeQuery();
+		try {
+			long executeTime = System.currentTimeMillis();
+			SQLQueryImpl query = new SQLQueryImpl(
+					getManager(), this,
+					connection, preparedStatement,
+					preparedStatement.executeQuery(),
+					executeTime
+			);
+			getManager().getActiveQuery().put(getActionUUID(), query);
+
+			return query;
+		} catch (SQLException exception) {
+			preparedStatement.close();
+			connection.close();
+			throw exception;
+		}
 
-		return new SQLQueryImpl(getManager(), this, connection, preparedStatement, resultSet);
 	}
 }

easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/QueryActionImpl.java

@@ -1,8 +1,8 @@
 package cc.carm.lib.easysql.action.query;
 
 import cc.carm.lib.easysql.action.AbstractSQLAction;
-import cc.carm.lib.easysql.api.action.query.QueryAction;
 import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.api.action.query.QueryAction;
 import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
 import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
@@ -10,7 +10,6 @@ import cc.carm.lib.easysql.query.SQLQueryImpl;
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
@@ -22,16 +21,34 @@ public class QueryActionImpl extends AbstractSQLAction<SQLQuery> implements Quer
 
 	@Override
 	public @NotNull SQLQueryImpl execute() throws SQLException {
+
 		Connection connection = getManager().getConnection();
-		Statement statement = connection.createStatement();
+		Statement statement;
+
+		try {
+			statement = connection.createStatement();
+		} catch (SQLException ex) {
+			connection.close();
+			throw ex;
+		}
 		
 		outputDebugMessage();
-
-		ResultSet resultSet = statement.executeQuery(getSQLContent());
-		SQLQueryImpl query = new SQLQueryImpl(getManager(), this, connection, statement, resultSet);
+		try {
+			long executeTime = System.currentTimeMillis();
+			SQLQueryImpl query = new SQLQueryImpl(
+					getManager(), this,
+					connection, statement,
+					statement.executeQuery(getSQLContent()),
+					executeTime
+			);
 			getManager().getActiveQuery().put(getActionUUID(), query);
 
 			return query;
+		} catch (SQLException exception) {
+			statement.close();
+			connection.close();
+			throw exception;
+		}
 	}
 
 

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

@@ -1,5 +1,6 @@
 package cc.carm.lib.easysql.builder.impl;
 
+import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.builder.ConditionalBuilder;
 import cc.carm.lib.easysql.builder.AbstractSQLBuilder;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
@@ -13,7 +14,9 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 
-public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B, T>, T>
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+
+public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B, T>, T extends SQLAction<?>>
 		extends AbstractSQLBuilder implements ConditionalBuilder<B, T> {
 
 	ArrayList<String> conditionSQLs = new ArrayList<>();
@@ -52,7 +55,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
 	public B addCondition(
 			@NotNull String queryName, @NotNull String operator, @Nullable Object queryValue
 	) {
-        addCondition("`" + queryName + "` " + operator + " ?");
+		addCondition(withBackQuote(queryName) + " " + operator + " ?");
 		this.conditionParams.add(queryValue);
 		return getThis();
 	}
@@ -61,7 +64,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
 	public B addCondition(
 			@NotNull String[] queryNames, @Nullable Object[] queryValues
 	) {
-        if (queryNames.length != queryValues.length) {
+		if (queryValues == null || queryNames.length != queryValues.length) {
 			throw new RuntimeException("queryNames are not match with queryValues");
 		}
 		for (int i = 0; i < queryNames.length; i++) {
@@ -73,7 +76,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
 
 	@Override
 	public B addNotNullCondition(@NotNull String queryName) {
-        return addCondition("`" + queryName + "` IS NOT NULL");
+		return addCondition(withBackQuote(queryName) + " IS NOT NULL");
 	}
 
 
@@ -83,7 +86,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
 	) {
 		if (startDate == null && endDate == null) return getThis(); // 都不限定时间，不用判断了
 		if (startDate != null) {
-            addCondition("`" + queryName + "` BETWEEN ? AND ?");
+			addCondition(withBackQuote(queryName) + " BETWEEN ? AND ?");
 			this.conditionParams.add(startDate);
 			if (endDate != null) {
 				this.conditionParams.add(endDate);
@@ -117,9 +120,9 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
 			Iterator<String> iterator = conditionSQLs.iterator();
 			while (iterator.hasNext()) {
 				conditionBuilder.append(iterator.next());
-                if (iterator.hasNext()) conditionBuilder.append(" ");
+				if (iterator.hasNext()) conditionBuilder.append(" AND ");
 			}
-            return conditionBuilder.toString();
+			return conditionBuilder.toString().trim();
 		} else {
 			return null;
 		}

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

@@ -1,13 +1,16 @@
 package cc.carm.lib.easysql.builder.impl;
 
 import cc.carm.lib.easysql.action.PreparedSQLUpdateActionImpl;
+import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.builder.DeleteBuilder;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
 
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+
 public class DeleteBuilderImpl
-        extends AbstractConditionalBuilder<DeleteBuilder, PreparedSQLUpdateAction>
+		extends AbstractConditionalBuilder<DeleteBuilder, SQLAction<Integer>>
 		implements DeleteBuilder {
 
 	String tableName;
@@ -22,7 +25,7 @@ public class DeleteBuilderImpl
 
 		StringBuilder sqlBuilder = new StringBuilder();
 
-        sqlBuilder.append("DELETE FROM `").append(getTableName()).append("`");
+		sqlBuilder.append("DELETE FROM ").append(withBackQuote(getTableName()));
 
 		if (hasConditions()) sqlBuilder.append(" ").append(buildConditionSQL());
 		if (limit > 0) sqlBuilder.append(" ").append(buildLimitSQL());

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

@@ -1,5 +1,6 @@
 package cc.carm.lib.easysql.builder.impl;
 
+import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.builder.InsertBuilder;
 import cc.carm.lib.easysql.builder.AbstractSQLBuilder;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
@@ -8,7 +9,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Iterator;
 import java.util.List;
 
-public abstract class InsertBuilderImpl<T> extends AbstractSQLBuilder implements InsertBuilder<T> {
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+
+public abstract class InsertBuilderImpl<T extends SQLAction<?>>
+		extends AbstractSQLBuilder implements InsertBuilder<T> {
 
 	String tableName;
 
@@ -21,10 +25,10 @@ public abstract class InsertBuilderImpl<T> extends AbstractSQLBuilder implements
 		int valueLength = columnNames.size();
 		StringBuilder sqlBuilder = new StringBuilder();
 
-        sqlBuilder.append("INSERT IGNORE INTO `").append(tableName).append("`(");
+		sqlBuilder.append("INSERT IGNORE INTO ").append(withBackQuote(tableName)).append("(");
 		Iterator<String> iterator = columnNames.iterator();
 		while (iterator.hasNext()) {
-            sqlBuilder.append("`").append(iterator.next()).append("`");
+			sqlBuilder.append(withBackQuote(iterator.next()));
 			if (iterator.hasNext()) sqlBuilder.append(", ");
 		}
 
@@ -40,6 +44,7 @@ public abstract class InsertBuilderImpl<T> extends AbstractSQLBuilder implements
 		return sqlBuilder.toString();
 	}
 
+	@Override
 	public String getTableName() {
 		return tableName;
 	}

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

@@ -1,5 +1,6 @@
 package cc.carm.lib.easysql.builder.impl;
 
+import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.builder.ReplaceBuilder;
 import cc.carm.lib.easysql.builder.AbstractSQLBuilder;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
@@ -8,7 +9,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Iterator;
 import java.util.List;
 
-public abstract class ReplaceBuilderImpl<T> extends AbstractSQLBuilder implements ReplaceBuilder<T> {
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+
+public abstract class ReplaceBuilderImpl<T extends SQLAction<?>>
+		extends AbstractSQLBuilder implements ReplaceBuilder<T> {
 
 	String tableName;
 
@@ -21,10 +25,10 @@ public abstract class ReplaceBuilderImpl<T> extends AbstractSQLBuilder implement
 		int valueLength = columnNames.size();
 		StringBuilder sqlBuilder = new StringBuilder();
 
-        sqlBuilder.append("REPLACE INTO `").append(tableName).append("`(");
+		sqlBuilder.append("REPLACE INTO ").append(withBackQuote(tableName)).append("(");
 		Iterator<String> iterator = columnNames.iterator();
 		while (iterator.hasNext()) {
-            sqlBuilder.append("`").append(iterator.next()).append("`");
+			sqlBuilder.append(withBackQuote(iterator.next()));
 			if (iterator.hasNext()) sqlBuilder.append(", ");
 		}
 
@@ -40,6 +44,7 @@ public abstract class ReplaceBuilderImpl<T> extends AbstractSQLBuilder implement
 		return sqlBuilder.toString();
 	}
 
+	@Override
 	public String getTableName() {
 		return tableName;
 	}

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

@@ -0,0 +1,133 @@
+package cc.carm.lib.easysql.builder.impl;
+
+import cc.carm.lib.easysql.action.SQLUpdateActionImpl;
+import cc.carm.lib.easysql.api.SQLAction;
+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;
+
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+import static cc.carm.lib.easysql.api.SQLBuilder.withQuote;
+
+public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAlterBuilder {
+
+	protected final @NotNull String tableName;
+
+	public TableAlterBuilderImpl(@NotNull SQLManagerImpl manager, @NotNull String tableName) {
+		super(manager);
+		this.tableName = tableName;
+	}
+
+	public @NotNull String getTableName() {
+		return tableName;
+	}
+
+	@Override
+	public SQLAction<Integer> renameTo(@NotNull String newTableName) {
+		return new SQLUpdateActionImpl(getManager(),
+				"ALTER TABLE " + withBackQuote(getTableName()) + " RENAME TO " + withBackQuote(newTableName) + ""
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> changeComment(@NotNull String newTableComment) {
+		return new SQLUpdateActionImpl(getManager(),
+				"ALTER TABLE " + withBackQuote(getTableName()) + " COMMENT " + withQuote(newTableComment)
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> setAutoIncrementIndex(int index) {
+		return new SQLUpdateActionImpl(getManager(),
+				"ALTER TABLE " + withBackQuote(getTableName()) + " AUTO_INCREMENT=" + index
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> addIndex(@NotNull IndexType indexType, @NotNull String indexName, @NotNull String columnName, @NotNull String... moreColumns) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " ADD "
+						+ TableCreateBuilderImpl.buildIndexSettings(indexType, indexName, columnName, moreColumns)
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> dropIndex(@NotNull String indexName) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " DROP INDEX " + withBackQuote(indexName)
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> dropForeignKey(@NotNull String keySymbol) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " DROP FOREIGN KEY " + withBackQuote(keySymbol)
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> dropPrimaryKey() {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(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 " + withBackQuote(afterColumn);
+			} else {
+				orderSettings = "FIRST";
+			}
+		}
+
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " ADD " + withBackQuote(columnName) + " " + settings
+						+ (orderSettings != null ? " " + orderSettings : "")
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> renameColumn(@NotNull String columnName, @NotNull String newName) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " RENAME COLUMN " + withBackQuote(columnName) + " TO " + withBackQuote(newName)
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> modifyColumn(@NotNull String columnName, @NotNull String settings) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " MODIFY COLUMN " + withBackQuote(columnName) + " " + settings
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> removeColumn(@NotNull String columnName) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " DROP " + withBackQuote(columnName)
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> setColumnDefault(@NotNull String columnName, @NotNull String defaultValue) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " ALTER " + withBackQuote(columnName) + " SET DEFAULT " + defaultValue
+		);
+	}
+
+	@Override
+	public SQLAction<Integer> removeColumnDefault(@NotNull String columnName) {
+		return createAction(
+				"ALTER TABLE " + withBackQuote(getTableName()) + " ALTER " + withBackQuote(columnName) + " DROP DEFAULT"
+		);
+	}
+
+	private SQLUpdateActionImpl createAction(@NotNull String sql) {
+		return new SQLUpdateActionImpl(getManager(), sql);
+	}
+}

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

@@ -3,27 +3,35 @@ package cc.carm.lib.easysql.builder.impl;
 import cc.carm.lib.easysql.action.SQLUpdateActionImpl;
 import cc.carm.lib.easysql.api.action.SQLUpdateAction;
 import cc.carm.lib.easysql.api.builder.TableCreateBuilder;
+import cc.carm.lib.easysql.api.enums.ForeignKeyRule;
+import cc.carm.lib.easysql.api.enums.IndexType;
+import cc.carm.lib.easysql.api.enums.NumberType;
 import cc.carm.lib.easysql.builder.AbstractSQLBuilder;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+import static cc.carm.lib.easysql.api.SQLBuilder.withQuote;
+
 public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableCreateBuilder {
 
-    String tableName;
+	protected final @NotNull String tableName;
 
-    List<String> columns;
+	@NotNull List<String> columns = new ArrayList<>();
+	@NotNull List<String> indexes = new ArrayList<>();
+	@NotNull List<String> foreignKeys = new ArrayList<>();
 
-    String tableSettings;
+	@NotNull String tableSettings = defaultTablesSettings();
+	@Nullable String tableComment;
 
-    public TableCreateBuilderImpl(SQLManagerImpl manager, String tableName) {
+	public TableCreateBuilderImpl(SQLManagerImpl manager, @NotNull String tableName) {
 		super(manager);
 		this.tableName = tableName;
-        this.columns = new ArrayList<>();
-        defaultTablesSettings();
 	}
 
 	@Override
@@ -39,13 +47,22 @@ public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableC
 	@Override
 	public SQLUpdateAction build() {
 		StringBuilder createSQL = new StringBuilder();
-        createSQL.append("CREATE TABLE IF NOT EXISTS `").append(tableName).append("`");
+		createSQL.append("CREATE TABLE IF NOT EXISTS ").append(withBackQuote(tableName));
 		createSQL.append("(");
-        for (int i = 0; i < columns.size(); i++) {
-            createSQL.append(columns.get(i));
-            if (i != columns.size() - 1) createSQL.append(", ");
+		createSQL.append(String.join(", ", columns));
+		if (indexes.size() > 0) {
+			createSQL.append(", ");
+			createSQL.append(String.join(", ", indexes));
+		}
+		if (foreignKeys.size() > 0) {
+			createSQL.append(", ");
+			createSQL.append(String.join(", ", foreignKeys));
+		}
+		createSQL.append(") ").append(getTableSettings());
+
+		if (tableComment != null) {
+			createSQL.append(" COMMENT ").append(withQuote(tableComment));
 		}
-        createSQL.append(") ").append(tableSettings);
 
 		return new SQLUpdateActionImpl(getManager(), createSQL.toString());
 	}
@@ -57,7 +74,47 @@ public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableC
 	}
 
 	@Override
-    public TableCreateBuilder setColumns(@NotNull String[] columns) {
+	public TableCreateBuilder addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType,
+	                                                 boolean asPrimaryKey, boolean unsigned) {
+		return addColumn(columnName,
+				(numberType == null ? NumberType.INT : numberType).name()
+						+ (unsigned ? " UNSIGNED " : " ")
+						+ "NOT NULL AUTO_INCREMENT " + (asPrimaryKey ? "PRIMARY KEY" : "UNIQUE KEY")
+		);
+	}
+
+	@Override
+	public TableCreateBuilder setIndex(@NotNull IndexType type, @Nullable String indexName,
+	                                   @NotNull String columnName, @NotNull String... moreColumns) {
+		this.indexes.add(buildIndexSettings(type, indexName, columnName, moreColumns));
+		return this;
+	}
+
+	@Override
+	public TableCreateBuilder addForeignKey(@NotNull String tableColumn, @Nullable String constraintName,
+	                                        @NotNull String foreignTable, @NotNull String foreignColumn,
+	                                        @Nullable ForeignKeyRule updateRule, @Nullable ForeignKeyRule deleteRule) {
+		StringBuilder keyBuilder = new StringBuilder();
+
+		keyBuilder.append("CONSTRAINT ");
+		if (constraintName == null) {
+			keyBuilder.append(withBackQuote("fk_" + tableColumn + "_" + foreignTable));
+		} else {
+			keyBuilder.append(withBackQuote(constraintName));
+		}
+		keyBuilder.append(" ");
+		keyBuilder.append("FOREIGN KEY (").append(withBackQuote(tableColumn)).append(") ");
+		keyBuilder.append("REFERENCES ").append(withBackQuote(foreignTable)).append("(").append(withBackQuote(foreignColumn)).append(")");
+
+		if (updateRule != null) keyBuilder.append(" ON UPDATE ").append(updateRule.getRuleName());
+		if (deleteRule != null) keyBuilder.append(" ON DELETE ").append(deleteRule.getRuleName());
+
+		this.foreignKeys.add(keyBuilder.toString());
+		return this;
+	}
+
+	@Override
+	public TableCreateBuilder setColumns(@NotNull String... columns) {
 		this.columns = Arrays.asList(columns);
 		return this;
 	}
@@ -68,4 +125,37 @@ public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableC
 		return this;
 	}
 
+	@Override
+	public TableCreateBuilder setTableComment(@Nullable String comment) {
+		this.tableComment = comment;
+		return this;
+	}
+
+	protected static String buildIndexSettings(@NotNull IndexType indexType, @Nullable String indexName,
+	                                           @NotNull String columnName, @NotNull String... moreColumns) {
+
+		StringBuilder indexBuilder = new StringBuilder();
+
+		indexBuilder.append(indexType.getName()).append(" ");
+		if (indexName != null) {
+			indexBuilder.append(withBackQuote(indexName));
+		}
+		indexBuilder.append("(");
+		indexBuilder.append(withBackQuote(columnName));
+
+		if (moreColumns.length > 0) {
+			indexBuilder.append(", ");
+
+			for (int i = 0; i < moreColumns.length; i++) {
+				indexBuilder.append(moreColumns[i]);
+				if (i != moreColumns.length - 1) indexBuilder.append(", ");
+			}
+
+		}
+
+		indexBuilder.append(")");
+
+		return indexBuilder.toString();
+	}
+
 }

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

@@ -7,6 +7,8 @@ import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+
 public class TableQueryBuilderImpl
 		extends AbstractConditionalBuilder<TableQueryBuilder, PreparedQueryAction>
 		implements TableQueryBuilder {
@@ -33,25 +35,25 @@ public class TableQueryBuilderImpl
 		} else {
 			for (int i = 0; i < columns.length; i++) {
 				String name = columns[i];
-                sqlBuilder.append("`").append(name).append("`");
+				sqlBuilder.append(withBackQuote(name));
 				if (i != columns.length - 1) {
 					sqlBuilder.append(",");
 				}
 			}
 		}
 
-        sqlBuilder.append(" ").append("FROM").append(" ");
-        sqlBuilder.append("`").append(tableName).append("`");
+		sqlBuilder.append(" ").append("FROM").append(" ").append(withBackQuote(tableName));
 
 		if (hasConditions()) sqlBuilder.append(" ").append(buildConditionSQL());
 
+		if (orderBy != null) sqlBuilder.append(" ").append(orderBy);
+
 		if (pageLimit != null && pageLimit.length == 2) {
 			sqlBuilder.append(" LIMIT ").append(pageLimit[0]).append(",").append(pageLimit[1]);
 		} else if (limit > 0) {
 			sqlBuilder.append(" ").append(buildLimitSQL());
 		}
 
-        if (orderBy != null) sqlBuilder.append(orderBy);
 
 		return new PreparedQueryActionImpl(getManager(), sqlBuilder.toString())
 				.setParams(hasConditionParams() ? getConditionParams() : null);
@@ -63,14 +65,14 @@ public class TableQueryBuilderImpl
 	}
 
 	@Override
-    public TableQueryBuilderImpl selectColumns(@NotNull String[] columnNames) {
+	public TableQueryBuilderImpl selectColumns(@NotNull String... columnNames) {
 		this.columns = columnNames;
 		return this;
 	}
 
 	@Override
 	public TableQueryBuilder orderBy(@NotNull String columnName, boolean asc) {
-        this.orderBy = "ORDER BY `" + columnName + "` " + (asc ? "ASC" : "DESC");
+		this.orderBy = "ORDER BY " + withBackQuote(columnName) + " " + (asc ? "ASC" : "DESC");
 		return this;
 	}
 

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

@@ -1,6 +1,7 @@
 package cc.carm.lib.easysql.builder.impl;
 
 import cc.carm.lib.easysql.action.PreparedSQLUpdateActionImpl;
+import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.builder.UpdateBuilder;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
@@ -8,8 +9,10 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
+import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
+
 public class UpdateBuilderImpl
-        extends AbstractConditionalBuilder<UpdateBuilder, PreparedSQLUpdateAction>
+		extends AbstractConditionalBuilder<UpdateBuilder, SQLAction<Integer>>
 		implements UpdateBuilder {
 
 	String tableName;
@@ -27,11 +30,11 @@ public class UpdateBuilderImpl
 
 		StringBuilder sqlBuilder = new StringBuilder();
 
-        sqlBuilder.append("UPDATE `").append(getTableName()).append("` SET ");
+		sqlBuilder.append("UPDATE ").append(withBackQuote(getTableName())).append(" SET ");
 
 		Iterator<String> iterator = this.columnNames.iterator();
 		while (iterator.hasNext()) {
-            sqlBuilder.append("`").append(iterator.next()).append("` = ?");
+			sqlBuilder.append(withBackQuote(iterator.next())).append(" = ?");
 			if (iterator.hasNext()) sqlBuilder.append(" , ");
 		}
 		List<Object> allParams = new ArrayList<>(this.columnValues);

easysql-impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java

@@ -62,6 +62,7 @@ public class SQLManagerImpl implements SQLManager {
 		if (isDebugMode()) getLogger().info("[DEBUG] " + msg);
 	}
 
+	@Override
 	public Logger getLogger() {
 		return LOGGER;
 	}
@@ -103,7 +104,7 @@ public class SQLManagerImpl implements SQLManager {
 	}
 
 	@Override
-	public List<Integer> executeSQLBatch(@NotNull String sql, String[] moreSQL) {
+	public List<Integer> executeSQLBatch(@NotNull String sql, String... moreSQL) {
 		SQLUpdateBatchAction action = new SQLUpdateBatchActionImpl(this, sql);
 		if (moreSQL != null && moreSQL.length > 0) {
 			Arrays.stream(moreSQL).forEach(action::addBatch);
@@ -129,6 +130,11 @@ public class SQLManagerImpl implements SQLManager {
 		return new TableCreateBuilderImpl(this, tableName);
 	}
 
+	@Override
+	public TableAlterBuilder alterTable(@NotNull String tableName) {
+		return new TableAlterBuilderImpl(this, tableName);
+	}
+
 	@Override
 	public QueryBuilder createQuery() {
 		return new QueryBuilderImpl(this);

easysql-impl/src/main/java/cc/carm/lib/easysql/query/SQLQueryImpl.java

@@ -25,7 +25,15 @@ public class SQLQueryImpl implements SQLQuery {
 			SQLManagerImpl sqlManager, QueryActionImpl queryAction,
 			Connection connection, Statement statement, ResultSet resultSet
 	) {
-		this.executeTime = System.currentTimeMillis();
+		this(sqlManager, queryAction, connection, statement, resultSet, System.currentTimeMillis());
+	}
+
+	public SQLQueryImpl(
+			SQLManagerImpl sqlManager, QueryActionImpl queryAction,
+			Connection connection, Statement statement, ResultSet resultSet,
+			long executeTime
+	) {
+		this.executeTime = executeTime;
 		this.sqlManager = sqlManager;
 		this.queryAction = queryAction;
 		this.connection = connection;

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;
 	}
 
 	/**
@@ -164,13 +160,19 @@ public class StatementUtil {
 			preparedStatement.setNull(paramIndex, type);
 		}
 
-        // 针对UUID特殊处理，避免元数据直接插入
+		// 针对UUID特殊处理，避免元数据直接传入
 		if (param instanceof UUID) {
 			preparedStatement.setString(paramIndex, param.toString());
 			return;
 		}
 
-        // 日期特殊处理，默认按照时间戳传入，避免毫秒丢失
+		// 针对StringBuilder或StringBuffer进行处理，避免元数据传入
+		if (param instanceof StringBuilder || param instanceof StringBuffer) {
+			preparedStatement.setString(paramIndex, param.toString());
+			return;
+		}
+
+		// 日期特殊处理，默认按照时间戳传入，避免精度丢失
 		if (param instanceof java.util.Date) {
 			if (param instanceof Date) {
 				preparedStatement.setDate(paramIndex, (Date) param);
@@ -188,16 +190,14 @@ public class StatementUtil {
 				// BigDecimal的转换交给JDBC驱动处理
 				preparedStatement.setBigDecimal(paramIndex, (BigDecimal) param);
 				return;
-            }
-            if (param instanceof BigInteger) {
-                // BigInteger转为BigDecimal
+			} else if (param instanceof BigInteger) {
 				preparedStatement.setBigDecimal(paramIndex, new BigDecimal((BigInteger) param));
 				return;
 			}
-            // 忽略其它数字类型，按照默认类型传入
+			// 其它数字类型按照默认类型传入
 		}
 
-        // 其它参数类型直接插入
+		// 其它参数类型直接传入
 		preparedStatement.setObject(paramIndex, param);
 	}
 

example/easysql-demo/pom.xml

@@ -5,14 +5,24 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.9</version>
+        <version>0.3.5</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
     <artifactId>easysql-demo</artifactId>
     <packaging>jar</packaging>
 
-    <name>99-EasySQL-Demo</name>
+    <name>EasySQL-Demo</name>
     <description>EasySQL的演示部分</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -45,15 +55,6 @@
         <url>${project.url}/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
     <dependencies>
 
         <dependency>

example/easysql-demo/src/main/java/EasySQLDemo.java

@@ -1,27 +1,56 @@
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.api.enums.ForeignKeyRule;
+import cc.carm.lib.easysql.api.enums.IndexType;
+import cc.carm.lib.easysql.api.enums.NumberType;
 import cc.carm.lib.easysql.api.util.TimeDateUtils;
 import cc.carm.lib.easysql.api.util.UUIDUtil;
+import org.jetbrains.annotations.TestOnly;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.UUID;
 
+@TestOnly
+@SuppressWarnings("all")
 public class EasySQLDemo {
 
 	public void createTable(SQLManager sqlManager) {
 		// 同步创建表
 		sqlManager.createTable("users")
-				.addColumn("id", "INT(11) AUTO_INCREMENT NOT NULL PRIMARY KEY")
+//				.addColumn("id", "INT(11) AUTO_INCREMENT NOT NULL PRIMARY KEY")
+				.addAutoIncrementColumn("id", NumberType.INT, true, true)
 				.addColumn("uuid", "VARCHAR(32) NOT NULL UNIQUE KEY")
-				.addColumn("username", "VARCHAR(16) NOT NULL UNIQUE KEY")
-				.addColumn("age", "INT(3) NOT NULL DEFAULT 1")
+				.addColumn("username", "VARCHAR(16) NOT NULL")
+				.addColumn("age", "TINYINT NOT NULL DEFAULT 1")
 				.addColumn("email", "VARCHAR(32)")
 				.addColumn("phone", "VARCHAR(16)")
 				.addColumn("registerTime", "DATETIME NOT NULL")
+//				.addColumn("INDEX `phone`") // 原始方法添加索引
+				.setIndex("username", IndexType.UNIQUE_KEY) // 添加唯一索引
+				.setIndex(IndexType.INDEX, "contact", "email", "phone") //添加联合索引 (示例)
+				.build().execute(null /* 不处理错误 */);
+
+		sqlManager.createTable("user_ipaddr")
+				.addAutoIncrementColumn("id", NumberType.INT, true, true)
+				.addColumn("uuid", "VARCHAR(32) NOT NULL")
+				.addColumn("ip", "VARCHAR(16)")
+				.addColumn("time", "DATETIME NOT NULL")
+				.addForeignKey("uuid", null,
+						"users", "uuid",
+						ForeignKeyRule.CASCADE, ForeignKeyRule.CASCADE
+				)
 				.build().execute(null /* 不处理错误 */);
 	}
 
+	public void alertTable(SQLManager sqlManager) {
+		// 同步更新表
+		sqlManager.alterTable("users")
+				.modifyColumn("age", "TINYINT NOT NULL DEFAULT 0")
+				.execute(null /* 不处理错误 */);
+	}
+
+
 	public void sqlQuery(SQLManager sqlManager) {
 		// 同步SQL查询
 		try (SQLQuery query = sqlManager.createQuery()

example/easysql-test/pom.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>easysql-parent</artifactId>
+        <groupId>cc.carm.lib</groupId>
+        <version>0.3.5</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+    <artifactId>easysql-test</artifactId>
+
+    <name>EasySQL-Test</name>
+    <description>EasySQL的测试代码</description>
+    <url>https://github.com/CarmJos/EasySQL</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easysql-beecp</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.28</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.35</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.17.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/MANIFEST.MF</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                    <!-- when downloading via Maven we can pull depends individually -->
+                    <shadedArtifactAttached>true</shadedArtifactAttached>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptRef>jar-with-dependencies</descriptRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>cc.carm.lib.easysql.testrunner.Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>assembly</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/EasySQLTest.java

@@ -0,0 +1,36 @@
+package cc.carm.lib.easysql.testrunner;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.sql.SQLException;
+
+public abstract class EasySQLTest {
+
+	@ApiStatus.OverrideOnly
+	public abstract void onTest(SQLManager sqlManager) throws SQLException;
+
+	public boolean executeTest(int index, SQLManager sqlManager) {
+		String testName = getClass().getSimpleName();
+
+		print("  #%s 测试 @%s 开始", index, testName);
+		long start = System.currentTimeMillis();
+
+		try {
+			onTest(sqlManager);
+			print("  #%s 测试 @%s 成功，耗时 %s ms。", index, testName, (System.currentTimeMillis() - start));
+			return true;
+		} catch (Exception exception) {
+			print("  #%s 测试 @%s 失败，耗时 %s ms。", index, testName, (System.currentTimeMillis() - start));
+			exception.printStackTrace();
+			return false;
+		}
+	}
+
+	protected static void print(@NotNull String format, Object... params) {
+		Main.print(format, params);
+	}
+
+
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java

@@ -0,0 +1,93 @@
+package cc.carm.lib.easysql.testrunner;
+
+import cc.carm.lib.easysql.EasySQL;
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.tests.DeleteTest;
+import cc.carm.lib.easysql.testrunner.tests.QueryCloseTest;
+import cc.carm.lib.easysql.testrunner.tests.QueryFunctionTest;
+import cc.carm.lib.easysql.testrunner.tests.TableCreateTest;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.TestOnly;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Scanner;
+import java.util.Set;
+
+@TestOnly
+@SuppressWarnings("all")
+public class Main {
+
+	public static void main(String[] args) {
+		if (args.length < 4) {
+			print("请提供以下参数：<数据库驱动> <数据库地址(JDBC)> <数据库用户> <数据库密码> [是否采用DEBUG(y/n)]");
+			return;
+		}
+
+		SQLManager sqlManager;
+		try {
+			print("初始化 SQLManager...");
+			print("数据库驱动 %s", args[0]);
+			print("数据库地址 %s", args[1]);
+			print("数据库用户 %s", args[2]);
+			print("数据库密码 %s", args[3]);
+			sqlManager = EasySQL.createManager(args[0], args[1], args[2], args[3]);
+			sqlManager.setDebugMode(args.length > 4);
+			print("SQLManager 初始化完成！");
+		} catch (Exception exception) {
+			print("SQLManager 初始化失败，请检查数据库配置。");
+			exception.printStackTrace();
+			return;
+		}
+
+		print("加载测试类...");
+		Set<EasySQLTest> tests = new LinkedHashSet<>();
+		tests.add(new TableCreateTest());
+//		tests.add(new TableAlterTest());
+//		tests.add(new TableRenameTest());
+//		tests.add(new QueryNotCloseTest());
+		tests.add(new QueryCloseTest());
+//		tests.add(new SQLUpdateBatchTests());
+//		tests.add(new SQLUpdateReturnKeysTest());
+		tests.add(new QueryFunctionTest());
+		tests.add(new DeleteTest());
+
+		print("准备进行测试...");
+
+		int index = 1;
+		int success = 0;
+
+		Iterator<EasySQLTest> testIterator = tests.iterator();
+
+		print("准备完成，请按回车键开始执行测试。");
+
+		while (testIterator.hasNext()) {
+			Scanner scanner = new Scanner(System.in);
+
+			if (scanner.nextLine() != null) {
+
+				EasySQLTest currentTest = testIterator.next();
+
+				if (currentTest.executeTest(index, sqlManager)) {
+					success++;
+				}
+
+				index++;
+			}
+
+		}
+
+		print(" ");
+		print("全部测试执行完毕，成功 %s 个，失败 %s 个。",
+				success, (tests.size() - success)
+		);
+
+		EasySQL.shutdownManager(sqlManager);
+
+	}
+
+	public static void print(@NotNull String format, Object... params) {
+		System.out.printf((format) + "%n", params);
+	}
+
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/DeleteTest.java

@@ -0,0 +1,22 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+
+public class DeleteTest extends EasySQLTest {
+
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		Integer changes = sqlManager.createDelete("test_user_table")
+				.addCondition("id", ">", 5)
+				.addNotNullCondition("username")
+				.build().execute();
+
+		System.out.println("change(s): " + changes);
+
+	}
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/QueryCloseTest.java

@@ -0,0 +1,31 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class QueryCloseTest extends EasySQLTest {
+
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		try (SQLQuery query = sqlManager.createQuery()
+				.inTable("test_user_table")
+				.orderBy("id", false)
+				.setLimit(5)
+				.build().execute()) {
+			ResultSet resultSet = query.getResultSet();
+
+			while (resultSet.next()) {
+
+				System.out.println("id: " + resultSet.getInt("id") + " username: " + resultSet.getString("username"));
+
+			}
+		}
+
+	}
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/QueryFunctionTest.java

@@ -0,0 +1,34 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+
+public class QueryFunctionTest extends EasySQLTest {
+
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		Integer id_1 = sqlManager.createQuery()
+				.inTable("test_user_table")
+				.orderBy("id", false)
+				.setLimit(1)
+				.build().executeFunction(query -> {
+					if (!query.getResultSet().next()) return -1;
+					else return query.getResultSet().getInt("id");
+				});
+
+		System.out.println("id (ps): " + id_1);
+
+		Integer id_2 = sqlManager.createQuery().withSQL("SELECT id FROM test_user_table ORDER BY id DESC LIMIT 1")
+				.executeFunction(query -> {
+					if (!query.getResultSet().next()) return -1;
+					else return query.getResultSet().getInt("id");
+				});
+
+		System.out.println("id (s): " + id_2);
+
+	}
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/QueryNotCloseTest.java

@@ -0,0 +1,30 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class QueryNotCloseTest extends EasySQLTest {
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+		SQLQuery query = sqlManager.createQuery()
+				.inTable("test_user_table")
+				.orderBy("id", false)
+				.setLimit(5)
+				.build().execute();
+
+		ResultSet resultSet = query.getResultSet();
+
+		while (resultSet.next()) {
+
+			System.out.println("id: " + resultSet.getInt("id") + " username: " + resultSet.getString("username"));
+
+		}
+
+
+	}
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/SQLUpdateBatchTests.java

@@ -0,0 +1,38 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class SQLUpdateBatchTests extends EasySQLTest {
+
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		List<Integer> updates = sqlManager.createInsertBatch("test_user_table")
+				.setColumnNames("uuid", "username", "age")
+				.setAllParams(generateParams())
+				.execute();
+
+		System.out.println("changes " + Arrays.toString(updates.toArray()));
+
+	}
+
+	protected List<Object[]> generateParams() {
+		return IntStream.range(0, 5).mapToObj(i -> generateParam()).collect(Collectors.toList());
+	}
+
+	protected Object[] generateParam() {
+		UUID uuid = UUID.randomUUID();
+		return new Object[]{uuid, uuid.toString().substring(0, 5), (int) (Math.random() * 50)};
+	}
+
+
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/SQLUpdateReturnKeysTest.java

@@ -0,0 +1,24 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+public class SQLUpdateReturnKeysTest extends SQLUpdateBatchTests {
+
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+		List<Integer> generatedKeys = sqlManager.createInsertBatch("test_user_table")
+				.setColumnNames("uuid", "username", "age")
+				.setAllParams(generateParams())
+				.returnGeneratedKeys()
+				.execute();
+
+		System.out.println("generated " + Arrays.toString(generatedKeys.toArray()));
+	}
+
+
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/TableAlterTest.java

@@ -0,0 +1,35 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.enums.NumberType;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+
+public class TableAlterTest extends EasySQLTest {
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		print("	修改 test_user_table");
+		sqlManager.alterTable("test_user_table")
+				.addColumn("test", "VARCHAR(16) NOT NULL")
+				.execute();
+
+		sqlManager.alterTable("test_user_table")
+				.addColumn("test2", "VARCHAR(16) NOT NULL", "username")
+				.execute();
+
+
+		print("	修改 test_user_info");
+		sqlManager.alterTable("test_user_info")
+				.addAutoIncrementColumn("num", NumberType.BIGINT, false, true)
+				.execute();
+
+		sqlManager.alterTable("test_user_info")
+				.addColumn("a", "VARCHAR(16) NOT NULL", "")
+				.execute();
+
+	}
+
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/TableCreateTest.java

@@ -0,0 +1,38 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.enums.ForeignKeyRule;
+import cc.carm.lib.easysql.api.enums.IndexType;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+
+public class TableCreateTest extends EasySQLTest {
+
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+
+		print("	创建 test_user_table");
+		sqlManager.createTable("test_user_table")
+				.addAutoIncrementColumn("id")
+				.addColumn("uuid", "VARCHAR(36) NOT NULL", "用户UUID")
+				.addColumn("username", "VARCHAR(16) NOT NULL", "用户名")
+				.addColumn("age", "TINYINT DEFAULT 0 NOT NULL", "年龄")
+
+				.setIndex("uuid", IndexType.UNIQUE_KEY)
+				.build().execute();
+
+		print("	创建 test_user_info");
+		sqlManager.createTable("test_user_info")
+				.addColumn("uid", "INT UNSIGNED NOT NULL")
+				.addColumn("info", "TEXT", "相关信息")
+				.addForeignKey("uid", "user",
+						"test_user_table", "id",
+						ForeignKeyRule.CASCADE, ForeignKeyRule.CASCADE
+				)
+				.setIndex(IndexType.FULLTEXT_INDEX, "sign", "info")
+				.build().execute();
+
+	}
+
+}

example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/tests/TableRenameTest.java

@@ -0,0 +1,16 @@
+package cc.carm.lib.easysql.testrunner.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.testrunner.EasySQLTest;
+
+import java.sql.SQLException;
+
+public class TableRenameTest extends EasySQLTest {
+	@Override
+	public void onTest(SQLManager sqlManager) throws SQLException {
+		print("	重命名 test_user_table");
+		sqlManager.alterTable("test_user_table")
+				.renameTo("test_user_table2")
+				.execute();
+	}
+}

example/easysql-test/src/main/resources/log4j2.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="cc.carm.lib.easysql">
+    <Appenders>
+        <console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n"/>
+        </console>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <OnStartupTriggeringPolicy/>
+            </Policies>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </filters>
+            <!--            <AppenderRef ref="WINDOWS_COMPAT" level="info"/>-->
+            <AppenderRef ref="File"/>
+            <appender-ref ref="Console"/>
+        </root>
+    </Loggers>
+</Configuration>
+

pom.xml

@@ -5,8 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <sonar.organization>carmjos</sonar.organization>
@@ -16,21 +17,22 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easysql-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.9</version>
+    <version>0.3.5</version>
 
     <modules>
         <module>easysql-api</module>
         <module>easysql-impl</module>
 
-        <module>easysql-beecp</module>
-        <module>easysql-hikaricp</module>
-        <module>easysql-demo</module>
+        <module>with-pool/easysql-beecp</module>
+        <module>with-pool/easysql-hikaricp</module>
+        <module>example/easysql-demo</module>
+        <module>example/easysql-test</module>
 
     </modules>
 
     <name>EasySQL</name>
     <description>简单便捷的数据库操作工具，可自选连接池。</description>
-    <url>https://github.com/CarmJos/${project.name}</url>
+    <url>https://github.com/CarmJos/EasySQL</url>
 
     <developers>
         <developer>
@@ -38,6 +40,7 @@
             <name>Carm Jos</name>
             <email>carm@carm.cc</email>
             <url>https://www.carm.cc</url>
+            <timezone>Asia/Shanghai</timezone>
         </developer>
     </developers>
 
@@ -45,6 +48,7 @@
         <connection>scm:git:git@github.com:CarmJos/EasySQL.git</connection>
         <developerConnection>scm:git:git@github.com:CarmJos/EasySQL.git</developerConnection>
         <url>https://github.com/CarmJos/EasySQL</url>
+        <tag>HEAD</tag>
     </scm>
 
     <licenses>
@@ -56,12 +60,12 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
     <repositories>
@@ -92,13 +96,12 @@
 
     <distributionManagement>
 
-        <downloadUrl>${project.url}/releases</downloadUrl>
-
-        <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
-        </repository>
+        <downloadUrl>https://github.com/CarmJos/EasySQL/releases</downloadUrl>
+        <site>
+            <id>easysql-javadoc</id>
+            <name>EasySQL JavaDoc (on Github Pages)</name>
+            <url>https://CarmJos.github.io/EasySQL</url>
+        </site>
 
     </distributionManagement>
 
@@ -114,7 +117,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>22.0.0</version>
+            <version>23.0.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -128,20 +131,37 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-            <!--            <plugin>-->
-            <!--                <groupId>org.apache.maven.plugins</groupId>-->
-            <!--                <artifactId>maven-gpg-plugin</artifactId>-->
-            <!--                <version>1.5</version>-->
-            <!--                <executions>-->
-            <!--                    <execution>-->
-            <!--                        <id>sign-artifacts</id>-->
-            <!--                        <phase>verify</phase>-->
-            <!--                        <goals>-->
-            <!--                            <goal>sign</goal>-->
-            <!--                        </goals>-->
-            <!--                    </execution>-->
-            <!--                </executions>-->
-            <!--            </plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <gpgArguments>
+                        <arg>--pinentry-mode</arg>
+                        <arg>loopback</arg>
+                    </gpgArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.3</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <useReleaseProfile>false</useReleaseProfile>
+                    <releaseProfiles>release</releaseProfiles>
+                    <goals>deploy</goals>
+                </configuration>
+            </plugin>
         </plugins>
 
         <pluginManagement>
@@ -150,17 +170,19 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.1</version>
                     <configuration>
                         <classifier>javadoc</classifier>
-                        <links>
-                            <link>https://javadoc.io/doc/org.jetbrains/annotations/</link>
-                        </links>
                         <detectJavaApiLink>false</detectJavaApiLink>
                         <encoding>UTF-8</encoding>
                         <charset>UTF-8</charset>
                         <docencoding>UTF-8</docencoding>
                         <locale>zh_CN</locale>
+
+                        <includeDependencySources>true</includeDependencySources>
+                        <dependencySourceIncludes>
+                            <dependencySourceInclude>cc.carm.lib:*</dependencySourceInclude>
+                        </dependencySourceIncludes>
                     </configuration>
                     <executions>
                         <execution>
@@ -175,10 +197,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.9.0</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
                         <encoding>UTF-8</encoding>
                         <compilerArgument>-parameters</compilerArgument>
                     </configuration>
@@ -187,13 +209,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.2</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.1</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -207,7 +229,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.2.4</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -235,7 +257,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
+                    <version>2.22.2</version>
                     <configuration>
                         <useSystemClassLoader>false</useSystemClassLoader>
                     </configuration>
@@ -253,5 +275,34 @@
 
     </build>
 
+    <profiles>
+
+        <profile>
+            <id>ossrh</id>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+
+        <profile>
+            <id>github</id>
+            <distributionManagement>
+                <repository>
+                    <id>github</id>
+                    <name>GitHub Packages</name>
+                    <url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+
+    </profiles>
 
 </project>

with-pool/easysql-beecp/pom.xml

@@ -5,14 +5,22 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.9</version>
+        <version>0.3.5</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-beecp</artifactId>
     <packaging>jar</packaging>
 
-    <name>12-EasySQL-BeeCP</name>
+    <name>EasySQL-BeeCP</name>
     <description>EasySQL的应用部分。此为BeeCP版本。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -37,24 +45,23 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
     <dependencies>
 
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easysql-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>easysql-impl</artifactId>
@@ -66,7 +73,7 @@
             <!--项目地址 https://github.com/Chris2018998/BeeCP  -->
             <groupId>com.github.chris2018998</groupId>
             <artifactId>beecp</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>
@@ -87,10 +94,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

with-pool/easysql-hikaricp/pom.xml

@@ -5,13 +5,21 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.9</version>
+        <version>0.3.5</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-hikaricp</artifactId>
 
-    <name>11-EasySQL-HikariCP</name>
+    <name>EasySQL-HikariCP</name>
     <description>EasySQL的应用部分。此为HikariCP版本。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -36,24 +44,23 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
     <dependencies>
 
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easysql-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>easysql-impl</artifactId>
@@ -86,10 +93,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>