[0.4.0] 版本更新

feat(function): 添加 andThen 与 compose 方法
。
2026-06-05 09:01:26 +08:00 · 2022-06-09 13:25:18 +08:00 · 2022-06-09 13:24:23 +08:00 · 2022-06-09 12:12:11 +08:00 · 2022-06-06 18:18:26 +08:00 · 2022-06-03 03:24:01 +08:00
49 changed files with 575 additions and 353 deletions
@@ -0,0 +1,27 @@
+# EasySQL Repository
+
+采用github的repo分支进行依赖，随项目发布而自动更新。
+
+其他依赖方式见主页介绍。
+
+## 依赖方式
+
+### Maven
+
+```xml
+<repositories>
+    <repository>
+        <id>EasySQL</id>
+        <name>GitHub Branch Repository</name>
+        <url>https://github.com/CarmJos/EasySQL/blob/repo/</url>
+    </repository>
+</repositories>
+```
+
+### Gradle
+
+```groovy
+repositories {
+    maven { url 'https://github.com/CarmJos/EasySQL/blob/repo/' }
+}
+```
@@ -11,10 +11,9 @@ on:
    types: [ published ]

 jobs:
-  gh-deploy:
-    name: "Publish Project (GitHub)"
+  packages-deploy:
+    name: "Publish Project (GitHub Packages)"
    runs-on: ubuntu-latest
-
    steps:
      - uses: actions/checkout@v2
      - name: "Set up JDK"
@@ -29,63 +28,16 @@ jobs:
          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"
+      - name: "Packages Deploy"
        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: |
-          rm -rf docs
-          mkdir -vp docs
-          cp -vrf api/target/apidocs/* docs/
-          cp -vrf .documentation/JAVADOC-README.md docs/README.md
-
-      - name: "Generate the Javadoc sitemap"
-        id: sitemap
-        uses: cicirello/generate-sitemap@v1
-        with:
-          base-url-path: https://carmjos.github.io/EasySQL
-          path-to-root: docs
-
-      - name: "Output stats"
-        run: |
-          echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
-          echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
-          echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
-
-      - name: "Configure Git"
-        env:
-          DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
-        run: |
-          sudo timedatectl set-timezone "Asia/Shanghai"
-          mkdir -p ~/.ssh/
-          echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan github.com >> ~/.ssh/known_hosts
-          git config --global user.name 'CarmJos'
-          git config --global user.email 'carm@carm.cc'
-
-      - name: "Commit documentations"
-        run: |
-          cd docs
-          git init
-          git remote add origin git@github.com:CarmJos/EasySQL.git
-          git checkout -b gh-pages
-          git add -A
-          git commit -m "API Document generated."
-
-      - name: "Push javadocs"
-        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"
@@ -105,4 +57,82 @@ jobs:
        env:
          MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASS }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
+  github-deploy:
+    name: "Deploy Project (GitHub 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
+          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"
+        run: mvn -B -Plocal deploy --file pom.xml -DskipTests
+        env:
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
+      - name: "Copy artifacts"
+        run: |
+          rm -rf deploy
+          mkdir -vp deploy
+          cp -vrf $HOME/local-deploy/* deploy/
+          cp -vrf .documentation/REPOSITORY-README.md deploy/README.md
+
+      - name: "Copy Javadoc"
+        run: |
+          rm -rf docs
+          mkdir -vp docs
+          cp -vrf api/target/apidocs/* docs/
+          cp -vrf .documentation/JAVADOC-README.md docs/README.md
+
+      - name: "Generate the Javadoc sitemap"
+        id: sitemap
+        uses: cicirello/generate-sitemap@v1
+        with:
+          base-url-path: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}
+          path-to-root: docs
+
+      - name: "Output stats"
+        run: |
+          echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
+          echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
+          echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
+
+      - name: "Configure Git"
+        env:
+          DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
+        run: |
+          sudo timedatectl set-timezone "Asia/Shanghai"
+          mkdir -p ~/.ssh/
+          echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan github.com >> ~/.ssh/known_hosts
+          git config --global user.name '${{ github.repository_owner }}'
+          git config --global user.email '${{ github.repository_owner }}@users.noreply.github.com'
+
+      - name: "Commit&Push repository files"
+        run: |
+          cd deploy
+          git init
+          git remote add origin git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.git
+          git checkout -b repo
+          git add -A
+          git commit -m "Maven project deployment."
+          git push origin HEAD:repo --force
+
+      - name: "Commit&Push documentations"
+        run: |
+          cd docs
+          git init
+          git remote add origin git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.git
+          git checkout -b gh-pages
+          git add -A
+          git commit -m "API documentation deployment."
+          git push origin HEAD:gh-pages --force
@@ -10,7 +10,7 @@
 # EasySQL

 [![version](https://img.shields.io/github/v/release/CarmJos/EasySQL)](https://github.com/CarmJos/EasySQL/releases)
-[![License](https://img.shields.io/github/license/CarmJos/EasySQL)](https://opensource.org/licenses/GPL-3.0)
+[![License](https://img.shields.io/github/license/CarmJos/EasySQL)](https://opensource.org/licenses/MIT)
 [![workflow](https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml)
 [![CodeFactor](https://www.codefactor.io/repository/github/carmjos/easysql/badge)](https://www.codefactor.io/repository/github/carmjos/easysql)
 ![CodeSize](https://img.shields.io/github/languages/code-size/CarmJos/EasySQL)
@@ -18,7 +18,7 @@

 简单便捷的数据库操作工具，可自定义连接池来源。

-随项目分别提供 [BeeCP](https://github.com/Chris2018998/BeeCP) 与 [Hikari](https://github.com/brettwooldridge/HikariCP~~~~)
+随项目分别提供 [BeeCP](https://github.com/Chris2018998/BeeCP) 与 [Hikari](https://github.com/brettwooldridge/HikariCP)
 两个连接池的版本。

 ## 优势
@@ -35,7 +35,7 @@

 ### 示例代码

-您可以 [点击这里](example/easysql-demo/src/main/java/EasySQLDemo.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。
+您可以 [点击这里](demo/src/main/java/EasySQLDemo.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。

 ### 依赖方式

@@ -55,9 +55,16 @@
            <name>Maven Central</name>
            <url>https://repo1.maven.org/maven2</url>
        </repository>
-        
+
        <repository>
-            <!--采用github依赖库，实时更新，但需要配置 (推荐) -->
+            <!--采用github的repo分支依赖，实时更新。 (推荐)-->
+            <id>EasySQL</id>
+            <name>GitHub Branch Repository</name>
+            <url>https://github.com/CarmJos/EasySQL/blob/repo/</url>
+        </repository>
+
+        <repository>
+            <!--采用github packages依赖库，安全稳定，但需要配置 -->
            <id>EasySQL</id>
            <name>GitHub Packages</name>
            <url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
@@ -141,8 +148,11 @@ repositories {

    // 采用Maven中心库，安全稳定，但版本更新需要等待同步 
    mavenCentral()
-    
-    // 采用github依赖库，实时更新，但需要配置 (推荐)
+
+    // 采用github的repo分支依赖，实时更新。 (推荐)
+    maven { url 'https://github.com/CarmJos/EasySQL/blob/repo/' }
+
+    // 采用github依赖库，安全稳定，但需要配置
    maven { url 'https://maven.pkg.github.com/CarmJos/EasySQL' }

    // 采用我的私人依赖库，简单方便，但可能因为变故而无法使用
@@ -194,8 +204,6 @@ dependencies {

 感谢您对开源项目的支持！

-<img height=25% width=25% src="https://raw.githubusercontent.com/CarmJos/CarmJos/main/img/donate-code.jpg"  alt=""/>
-
 ## 开源协议

 本项目源码采用 [The MIT License](https://opensource.org/licenses/MIT) 开源协议。
@@ -5,13 +5,13 @@
    <parent>
        <groupId>cc.carm.lib</groupId>
        <artifactId>easysql-parent</artifactId>
-        <version>0.3.13</version>
+        <version>0.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
@@ -78,10 +78,6 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-            </plugin>
        </plugins>
    </build>

@@ -12,6 +12,7 @@ import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;

 /**
 * SQLAction 是用于承载SQL语句并进行处理、返回的基本类。
@@ -49,11 +50,23 @@ public interface SQLAction<T> {
    @NotNull String getShortID();

    /**
-     * 得到该Action的创建时间
+     * 得到该Action的创建时间。
+     * <br>注意，此处获得的时间非时间戳毫秒数，仅用于计算耗时。
     *
+     * @return 创建时间 (毫秒)
+     */
+    default long getCreateTime() {
+        return getCreateTime(TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 得到该Action的创建时间
+     * <br>注意，此处获得的时间非时间戳毫秒数，仅用于计算耗时。
+     *
+     * @param unit 时间单位
     * @return 创建时间
     */
-    long getCreateTime();
+    long getCreateTime(TimeUnit unit);

    /**
     * 得到该Action所要执行的源SQL语句
@@ -110,7 +110,7 @@ public interface SQLManager {
     * @return 更新的行数
     * @see SQLUpdateAction
     */
-    @Nullable Long executeSQL(String sql);
+    @Nullable Integer executeSQL(String sql);

    /**
     * 执行一条不需要返回结果的预处理SQL更改(UPDATE、REPLACE、DELETE)
@@ -120,7 +120,7 @@ public interface SQLManager {
     * @return 更新的行数
     * @see PreparedSQLUpdateAction
     */
-    @Nullable Long executeSQL(String sql, Object[] params);
+    @Nullable Integer executeSQL(String sql, Object[] params);

    /**
     * 执行多条不需要返回结果的SQL更改(UPDATE、REPLACE、DELETE)
@@ -130,7 +130,7 @@ public interface SQLManager {
     * @return 对应参数返回的行数
     * @see PreparedSQLUpdateBatchAction
     */
-    @Nullable List<Long> executeSQLBatch(String sql, Iterable<Object[]> paramsBatch);
+    @Nullable List<Integer> executeSQLBatch(String sql, Iterable<Object[]> paramsBatch);


    /**
@@ -181,7 +181,7 @@ public interface SQLManager {
     * @param tableName 目标表名
     * @return {@link InsertBuilder}
     */
-    InsertBuilder<PreparedSQLUpdateAction> createInsert(@NotNull String tableName);
+    InsertBuilder<PreparedSQLUpdateAction<Integer>> createInsert(@NotNull String tableName);

    /**
     * 创建支持多组数据的插入操作
@@ -189,7 +189,7 @@ public interface SQLManager {
     * @param tableName 目标表名
     * @return {@link InsertBuilder}
     */
-    InsertBuilder<PreparedSQLUpdateBatchAction> createInsertBatch(@NotNull String tableName);
+    InsertBuilder<PreparedSQLUpdateBatchAction<Integer>> createInsertBatch(@NotNull String tableName);

    /**
     * 创建一条替换操作
@@ -197,7 +197,7 @@ public interface SQLManager {
     * @param tableName 目标表名
     * @return {@link ReplaceBuilder}
     */
-    ReplaceBuilder<PreparedSQLUpdateAction> createReplace(@NotNull String tableName);
+    ReplaceBuilder<PreparedSQLUpdateAction<Integer>> createReplace(@NotNull String tableName);

    /**
     * 创建支持多组数据的替换操作
@@ -205,7 +205,7 @@ public interface SQLManager {
     * @param tableName 目标表名
     * @return {@link ReplaceBuilder}
     */
-    ReplaceBuilder<PreparedSQLUpdateBatchAction> createReplaceBatch(@NotNull String tableName);
+    ReplaceBuilder<PreparedSQLUpdateBatchAction<Integer>> createReplaceBatch(@NotNull String tableName);

    /**
     * 创建更新操作
@@ -6,6 +6,7 @@ import cc.carm.lib.easysql.api.action.query.QueryAction;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.concurrent.TimeUnit;

 /**
 * SQLQuery 是一个查询中间接口，用于查询操作的封装。
@@ -16,10 +17,22 @@ public interface SQLQuery extends AutoCloseable {

    /**
     * 获取该查询创建的时间
+     * <br>注意，此处获得的时间非时间戳毫秒数，仅用于计算耗时。
     *
     * @return 创建时间
     */
-    long getExecuteTime();
+    default long getExecuteTime() {
+        return getExecuteTime(TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 获取该查询创建的时间
+     * <br>注意，此处获得的时间非时间戳毫秒数，仅用于计算耗时。
+     *
+     * @param timeUnit 时间单位
+     * @return 创建时间
+     */
+    long getExecuteTime(TimeUnit timeUnit);

    /**
     * 得到承载该SQLQuery的对应{@link SQLManager}
@@ -25,8 +25,10 @@ public abstract class SQLTable {
    public static @NotNull SQLTable of(@NotNull String tableName, @Nullable SQLHandler<TableCreateBuilder> table) {
        return new SQLTable(tableName) {
            @Override
-            public boolean create(SQLManager sqlManager) throws SQLException {
+            public boolean create(@NotNull SQLManager sqlManager, String tablePrefix) throws SQLException {
                if (this.manager == null) this.manager = sqlManager;
+                this.tablePrefix = tablePrefix;
+
                TableCreateBuilder tableBuilder = sqlManager.createTable(getTableName());
                if (table != null) table.accept(tableBuilder);
                return tableBuilder.build().executeFunction(l -> l > 0, false);
@@ -48,6 +50,7 @@ public abstract class SQLTable {

    private final @NotNull String tableName;

+    protected String tablePrefix;
    protected SQLManager manager;

    /**
@@ -60,17 +63,22 @@ public abstract class SQLTable {
    }

    public @NotNull String getTableName() {
-        return tableName;
+        return (tablePrefix != null ? tablePrefix : "") + tableName;
    }

    /**
     * 使用指定 SQLManager 进行本示例的初始化。
     *
-     * @param sqlManager {@link SQLManager}
+     * @param sqlManager  {@link SQLManager}
+     * @param tablePrefix 表名前缀
     * @return 本表是否为首次创建
     * @throws SQLException 出现任何错误时抛出
     */
-    public abstract boolean create(SQLManager sqlManager) throws SQLException;
+    public abstract boolean create(@NotNull SQLManager sqlManager, @Nullable String tablePrefix) throws SQLException;
+
+    public boolean create(@NotNull SQLManager sqlManager) throws SQLException {
+        return create(manager, null);
+    }

    public @NotNull TableQueryBuilder createQuery(@NotNull SQLManager sqlManager) {
        return sqlManager.createQuery().inTable(getTableName());
@@ -97,38 +105,38 @@ public abstract class SQLTable {
    }


-    public @NotNull InsertBuilder<PreparedSQLUpdateAction> createInsert() {
+    public @NotNull InsertBuilder<PreparedSQLUpdateAction<Integer>> createInsert() {
        return createInsert(this.manager);
    }

-    public @NotNull InsertBuilder<PreparedSQLUpdateAction> createInsert(@NotNull SQLManager sqlManager) {
+    public @NotNull InsertBuilder<PreparedSQLUpdateAction<Integer>> createInsert(@NotNull SQLManager sqlManager) {
        return sqlManager.createInsert(getTableName());
    }


-    public @NotNull InsertBuilder<PreparedSQLUpdateBatchAction> createInsertBatch() {
+    public @NotNull InsertBuilder<PreparedSQLUpdateBatchAction<Integer>> createInsertBatch() {
        return createInsertBatch(this.manager);
    }

-    public @NotNull InsertBuilder<PreparedSQLUpdateBatchAction> createInsertBatch(@NotNull SQLManager sqlManager) {
+    public @NotNull InsertBuilder<PreparedSQLUpdateBatchAction<Integer>> createInsertBatch(@NotNull SQLManager sqlManager) {
        return sqlManager.createInsertBatch(getTableName());
    }


-    public @NotNull ReplaceBuilder<PreparedSQLUpdateAction> createReplace() {
+    public @NotNull ReplaceBuilder<PreparedSQLUpdateAction<Integer>> createReplace() {
        return createReplace(this.manager);
    }

-    public @NotNull ReplaceBuilder<PreparedSQLUpdateAction> createReplace(@NotNull SQLManager sqlManager) {
+    public @NotNull ReplaceBuilder<PreparedSQLUpdateAction<Integer>> createReplace(@NotNull SQLManager sqlManager) {
        return sqlManager.createReplace(getTableName());
    }


-    public @NotNull ReplaceBuilder<PreparedSQLUpdateBatchAction> createReplaceBatch() {
+    public @NotNull ReplaceBuilder<PreparedSQLUpdateBatchAction<Integer>> createReplaceBatch() {
        return createReplaceBatch(this.manager);
    }

-    public @NotNull ReplaceBuilder<PreparedSQLUpdateBatchAction> createReplaceBatch(@NotNull SQLManager sqlManager) {
+    public @NotNull ReplaceBuilder<PreparedSQLUpdateBatchAction<Integer>> createReplaceBatch(@NotNull SQLManager sqlManager) {
        return sqlManager.createReplaceBatch(getTableName());
    }

@@ -2,7 +2,7 @@ package cc.carm.lib.easysql.api.action;

 import org.jetbrains.annotations.Nullable;

-public interface PreparedSQLUpdateAction extends SQLUpdateAction {
+public interface PreparedSQLUpdateAction<T extends Number> extends SQLUpdateAction<T> {

    /**
     * 设定SQL语句中所有 ? 对应的参数
@@ -10,14 +10,15 @@ public interface PreparedSQLUpdateAction extends SQLUpdateAction {
     * @param params 参数内容
     * @return {@link PreparedSQLUpdateAction}
     */
-    PreparedSQLUpdateAction setParams(Object... params);
+    PreparedSQLUpdateAction<T> setParams(Object... params);

    /**
     * 设定SQL语句中所有 ? 对应的参数
     *
     * @param params 参数内容
     * @return {@link PreparedSQLUpdateAction}
+     * @since 0.4.0
     */
-    PreparedSQLUpdateAction setParams(@Nullable Iterable<Object> params);
+    PreparedSQLUpdateAction<T> setParams(@Nullable Iterable<Object> params);

 }
@@ -4,7 +4,7 @@ import cc.carm.lib.easysql.api.SQLAction;

 import java.util.List;

-public interface PreparedSQLUpdateBatchAction extends SQLAction<List<Long>> {
+public interface PreparedSQLUpdateBatchAction<T extends Number> extends SQLAction<List<T>> {

    /**
     * 设定多组SQL语句中所有 ? 对应的参数
@@ -12,7 +12,7 @@ public interface PreparedSQLUpdateBatchAction extends SQLAction<List<Long>> {
     * @param allParams 所有参数内容
     * @return {@link PreparedSQLUpdateBatchAction}
     */
-    PreparedSQLUpdateBatchAction setAllParams(Iterable<Object[]> allParams);
+    PreparedSQLUpdateBatchAction<T> setAllParams(Iterable<Object[]> allParams);

    /**
     * 添加一组SQL语句中所有 ? 对应的参数
@@ -20,37 +20,23 @@ public interface PreparedSQLUpdateBatchAction extends SQLAction<List<Long>> {
     * @param params 参数内容
     * @return {@link PreparedSQLUpdateBatchAction}
     */
-    PreparedSQLUpdateBatchAction addParamsBatch(Object... params);
-
-    /**
-     * 设定自增主键的序列
-     *
-     * @param keyColumnIndex 自增主键的序列
-     *                       <br>若该值 ＞ 0，则 {@link #execute()} 返回自增主键数值
-     *                       <br>若该值 ≤ 0，则 {@link #execute()} 返回变更的行数
-     * @return {@link PreparedSQLUpdateBatchAction}
-     * @see #setReturnGeneratedKeys(boolean)
-     */
-    @Deprecated
-    default PreparedSQLUpdateBatchAction setKeyIndex(int keyColumnIndex) {
-        return setReturnGeneratedKeys(keyColumnIndex > 0);
-    }
+    PreparedSQLUpdateBatchAction<T> addParamsBatch(Object... params);

    /**
     * 设定该操作返回自增键序列。
     *
-     * @return {@link PreparedSQLUpdateBatchAction}
+     * @return {@link SQLUpdateAction}
     */
-    default PreparedSQLUpdateBatchAction returnGeneratedKeys() {
-        return setReturnGeneratedKeys(true);
-    }
+    PreparedSQLUpdateBatchAction<T> returnGeneratedKeys();

    /**
-     * 设定该操作是否返回自增键序列。
+     * 设定该操作返回自增键序列。
     *
-     * @param returnGeneratedKey 是否返回自增键序列
-     * @return {@link PreparedSQLUpdateBatchAction}
+     * @param keyTypeClass 自增序列的数字类型
+     * @param <N>          自增键序列类型 {@link Number}
+     * @return {@link SQLUpdateAction}
+     * @since 0.4.0
     */
-    PreparedSQLUpdateBatchAction setReturnGeneratedKeys(boolean returnGeneratedKey);
+    <N extends Number> PreparedSQLUpdateBatchAction<N> returnGeneratedKeys(Class<N> keyTypeClass);

 }
@@ -2,37 +2,25 @@ package cc.carm.lib.easysql.api.action;

 import cc.carm.lib.easysql.api.SQLAction;

-public interface SQLUpdateAction extends SQLAction<Long> {
+public interface SQLUpdateAction<T extends Number> extends SQLAction<T> {

-    /**
-     * 设定自增主键的序列
-     *
-     * @param keyColumnIndex 自增主键的序列
-     *                       <br>若该值 ＞ 0，则 {@link #execute()} 返回自增主键数值
-     *                       <br>若该值 ≤ 0，则 {@link #execute()} 返回变更的行数
-     * @return {@link SQLUpdateAction}
-     * @see #setReturnGeneratedKey(boolean)
-     */
-    @Deprecated
-    default SQLUpdateAction setKeyIndex(int keyColumnIndex) {
-        return setReturnGeneratedKey(keyColumnIndex > 0);
-    }

    /**
     * 设定该操作返回自增键序列。
     *
     * @return {@link SQLUpdateAction}
     */
-    default SQLUpdateAction returnGeneratedKey() {
-        return setReturnGeneratedKey(true);
-    }
+    SQLUpdateAction<T> returnGeneratedKey();

    /**
-     * 设定该操作是否返回自增键序列。
+     * 设定该操作返回自增键序列。
     *
-     * @param returnGeneratedKey 是否返回自增键序列
+     * @param keyTypeClass 自增序列的数字类型
+     * @param <N>          自增键序列类型 {@link Number}
     * @return {@link SQLUpdateAction}
+     * @since 0.4.0
     */
-    SQLUpdateAction setReturnGeneratedKey(boolean returnGeneratedKey);
+    <N extends Number> SQLUpdateAction<N> returnGeneratedKey(Class<N> keyTypeClass);
+

 }
@@ -47,9 +47,7 @@ public interface ConditionalBuilder<B extends ConditionalBuilder<B, T>, T extend

    B addCondition(@NotNull String columnName, @NotNull String operator, @Nullable Object queryValue);

-    default B addCondition(@NotNull String columnName, @Nullable Object queryValue) {
-        return addCondition(columnName, "=", queryValue);
-    }
+    B addCondition(@NotNull String columnName, @Nullable Object queryValue);

    B addCondition(@NotNull String[] columnNames, @Nullable Object[] queryValues);

@@ -2,7 +2,7 @@ package cc.carm.lib.easysql.api.builder;

 import cc.carm.lib.easysql.api.SQLAction;

-public interface DeleteBuilder extends ConditionalBuilder<DeleteBuilder, SQLAction<Long>> {
+public interface DeleteBuilder extends ConditionalBuilder<DeleteBuilder, SQLAction<Integer>> {

    String getTableName();

@@ -10,13 +10,13 @@ import org.jetbrains.annotations.Nullable;

 public interface TableAlterBuilder extends SQLBuilder {

-    SQLAction<Long> renameTo(@NotNull String newTableName);
+    SQLAction<Integer> renameTo(@NotNull String newTableName);

-    SQLAction<Long> changeComment(@NotNull String newTableComment);
+    SQLAction<Integer> changeComment(@NotNull String newTableComment);

-    SQLAction<Long> setAutoIncrementIndex(int index);
+    SQLAction<Integer> setAutoIncrementIndex(int index);

-    SQLAction<Long> addIndex(@NotNull IndexType indexType, @Nullable String indexName,
+    SQLAction<Integer> addIndex(@NotNull IndexType indexType, @Nullable String indexName,
                                @NotNull String columnName, @NotNull String... moreColumns);

    /**
@@ -25,7 +25,7 @@ public interface TableAlterBuilder extends SQLBuilder {
     * @param indexName 索引名
     * @return {@link SQLUpdateAction}
     */
-    SQLAction<Long> dropIndex(@NotNull String indexName);
+    SQLAction<Integer> dropIndex(@NotNull String indexName);

    /**
     * 为该表移除一个外键
@@ -33,14 +33,14 @@ public interface TableAlterBuilder extends SQLBuilder {
     * @param keySymbol 外键名
     * @return {@link SQLUpdateAction}
     */
-    SQLAction<Long> dropForeignKey(@NotNull String keySymbol);
+    SQLAction<Integer> dropForeignKey(@NotNull String keySymbol);

    /**
     * 为该表移除主键(须添加新主键)
     *
     * @return {@link SQLUpdateAction}
     */
-    SQLAction<Long> dropPrimaryKey();
+    SQLAction<Integer> dropPrimaryKey();

    /**
     * 为表添加一列
@@ -49,7 +49,7 @@ public interface TableAlterBuilder extends SQLBuilder {
     * @param settings   列的相关设定
     * @return {@link SQLUpdateAction}
     */
-    default SQLAction<Long> addColumn(@NotNull String columnName, @NotNull String settings) {
+    default SQLAction<Integer> addColumn(@NotNull String columnName, @NotNull String settings) {
        return addColumn(columnName, settings, null);
    }

@@ -63,21 +63,21 @@ public interface TableAlterBuilder extends SQLBuilder {
     *                    <p> 若为 "" 则置于首行。
     * @return {@link SQLUpdateAction}
     */
-    SQLAction<Long> addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn);
+    SQLAction<Integer> addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn);

-    SQLAction<Long> renameColumn(@NotNull String columnName, @NotNull String newName);
+    SQLAction<Integer> renameColumn(@NotNull String columnName, @NotNull String newName);

-    SQLAction<Long> modifyColumn(@NotNull String columnName, @NotNull String settings);
+    SQLAction<Integer> modifyColumn(@NotNull String columnName, @NotNull String settings);

-    default SQLAction<Long> modifyColumn(@NotNull String columnName, @NotNull String columnSettings, @NotNull String afterColumn) {
+    default SQLAction<Integer> modifyColumn(@NotNull String columnName, @NotNull String columnSettings, @NotNull String afterColumn) {
        return modifyColumn(columnName, columnSettings + " AFTER `" + afterColumn + "`");
    }

-    SQLAction<Long> removeColumn(@NotNull String columnName);
+    SQLAction<Integer> removeColumn(@NotNull String columnName);

-    SQLAction<Long> setColumnDefault(@NotNull String columnName, @NotNull String defaultValue);
+    SQLAction<Integer> setColumnDefault(@NotNull String columnName, @NotNull String defaultValue);

-    SQLAction<Long> removeColumnDefault(@NotNull String columnName);
+    SQLAction<Integer> removeColumnDefault(@NotNull String columnName);

    /**
     * 为该表添加一个自增列
@@ -90,7 +90,7 @@ public interface TableAlterBuilder extends SQLBuilder {
     * @param unsigned   是否采用 UNSIGNED (即无负数，可以增加自增键的最高数，建议为true)
     * @return {@link TableCreateBuilder}
     */
-    default SQLAction<Long> addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType,
+    default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName, @Nullable NumberType numberType,
                                                      boolean primary, boolean unsigned) {
        return addColumn(columnName,
                (numberType == null ? NumberType.INT : numberType).name()
@@ -109,7 +109,7 @@ public interface TableAlterBuilder extends SQLBuilder {
     * @param numberType 数字类型，若省缺则为 {@link NumberType#INT}
     * @return {@link TableAlterBuilder}
     */
-    default SQLAction<Long> addAutoIncrementColumn(@NotNull String columnName, @NotNull NumberType numberType) {
+    default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName, @NotNull NumberType numberType) {
        return addAutoIncrementColumn(columnName, numberType, false, true);
    }

@@ -122,7 +122,7 @@ public interface TableAlterBuilder extends SQLBuilder {
     * @param columnName 列名
     * @return {@link TableAlterBuilder}
     */
-    default SQLAction<Long> addAutoIncrementColumn(@NotNull String columnName) {
+    default SQLAction<Integer> addAutoIncrementColumn(@NotNull String columnName) {
        return addAutoIncrementColumn(columnName, NumberType.INT);
    }

@@ -21,7 +21,7 @@ public interface TableCreateBuilder extends SQLBuilder {
     *
     * @return {@link SQLUpdateAction}
     */
-    SQLUpdateAction build();
+    SQLUpdateAction<Integer> build();

    @NotNull String getTableName();

@@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;

 import java.util.LinkedHashMap;

-public interface UpdateBuilder extends ConditionalBuilder<UpdateBuilder, SQLAction<Long>> {
+public interface UpdateBuilder extends ConditionalBuilder<UpdateBuilder, SQLAction<Integer>> {

    String getTableName();

@@ -8,8 +8,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;

-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;

 /**
 * 异常处理器。
@@ -30,55 +31,67 @@ public interface SQLDebugHandler {
    /**
     * 该方法将在 {@link SQLQuery#close()} 执行后调用。
     *
-     * @param query       {@link SQLQuery} 对象
-     * @param executeTime 该次查询开始执行的时间
-     * @param closeTime   该次查询彻底关闭的时间
+     * @param query           {@link SQLQuery} 对象
+     * @param executeNanoTime 该次查询开始执行的时间 (单位：纳秒)
+     * @param closeNanoTime   该次查询彻底关闭的时间 (单位：纳秒)
     */
-    void afterQuery(@NotNull SQLQuery query, long executeTime, long closeTime);
+    void afterQuery(@NotNull SQLQuery query, long executeNanoTime, long closeNanoTime);
+
+    default String parseParams(@Nullable Object[] params) {
+        if (params == null) return "<#NULL>";
+        else if (params.length == 0) return "<#EMPTY>";
+
+        List<String> paramsString = new ArrayList<>();
+        for (Object param : params) {
+            if (param == null) paramsString.add("NULL");
+            else paramsString.add(param.toString());
+        }
+        return String.join(", ", paramsString);
+    }

    @SuppressWarnings("DuplicatedCode")
    static SQLDebugHandler defaultHandler(Logger logger) {
        return new SQLDebugHandler() {
+
            @Override
            public void beforeExecute(@NotNull SQLAction<?> action, @NotNull List<@Nullable Object[]> params) {
                logger.info("┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
                logger.info("┣# ActionUUID: {}", action.getActionUUID());
-                logger.info("┣# ActionType: {}", action.getClass().getName());
+                logger.info("┣# ActionType: {}", action.getClass().getSimpleName());
                if (action.getSQLContents().size() == 1) {
                    logger.info("┣# SQLContent: {}", action.getSQLContents().get(0));
                } else {
                    logger.info("┣# SQLContents: ");
                    int i = 0;
                    for (String sqlContent : action.getSQLContents()) {
-                        logger.info("┃ [{}] {}", ++i, sqlContent);
+                        logger.info("┃ - [{}] {}", ++i, sqlContent);
                    }
                }
                if (params.size() == 1) {
                    Object[] param = params.get(0);
                    if (param != null) {
-                        logger.info("┣# SQLParams({}): {}", param.length, Arrays.stream(param).map(Object::toString).reduce((a, b) -> a + ", " + b).orElse(""));
+                        logger.info("┣# SQLParam: {}", parseParams(param));
                    }
                } else if (params.size() > 1) {
                    logger.info("┣# SQLParams: ");
                    int i = 0;
                    for (Object[] param : params) {
-                        if (param != null) {
-                            logger.info("┃ [{}] {}", ++i, Arrays.stream(param).map(Object::toString).reduce((a, b) -> a + ", " + b).orElse(""));
-                        } else {
-                            logger.info("┃ [{}] {}", ++i, "<#NULL>");
-                        }
+                        logger.info("┃ - [{}] {}", ++i, parseParams(param));
                    }
                }
-                logger.info("┣# createTime: {}", action.getCreateTime());
+                logger.info("┣# CreateTime: {}", action.getCreateTime(TimeUnit.MILLISECONDS));
                logger.info("┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
            }

            @Override
-            public void afterQuery(@NotNull SQLQuery query, long executeTime, long closeTime) {
+            public void afterQuery(@NotNull SQLQuery query, long executeNanoTime, long closeNanoTime) {
                logger.info("┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
                logger.info("┣# ActionUUID: {}", query.getAction().getActionUUID());
                logger.info("┣# SQLContent: {}", query.getSQLContent());
-                logger.info("┣# executeCost: {} ms", (closeTime - executeTime));
+                logger.info("┣# CloseTime: {}  (cost {} ms)",
+                        TimeUnit.NANOSECONDS.toMillis(closeNanoTime),
+                        ((double) (closeNanoTime - executeNanoTime) / 1000000)
+                );
                logger.info("┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
            }
        };
@@ -4,6 +4,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.sql.SQLException;
+import java.util.Objects;

@FunctionalInterface
 public interface SQLFunction<T, R> {
@@ -11,4 +12,23 @@ public interface SQLFunction<T, R> {
    @Nullable
    R apply(@NotNull T t) throws SQLException;

+    default <V> SQLFunction<V, R> compose(@NotNull SQLFunction<? super V, ? extends T> before) {
+        Objects.requireNonNull(before);
+        return (V v) -> {
+            T t = before.apply(v);
+            if (t == null) return null;
+            else return apply(t);
+        };
+    }
+
+    default <V> SQLFunction<T, V> then(@NotNull SQLFunction<? super R, ? extends V> after) {
+        Objects.requireNonNull(after);
+        return (T t) -> {
+            R r = apply(t);
+            if (r == null) return null;
+            else return after.apply(r);
+        };
+    }
+
+
 }
@@ -5,14 +5,13 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.13</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>0.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</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>
@@ -115,6 +114,10 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
        </plugins>
    </build>
 </project>
@@ -134,10 +134,10 @@ public class EasySQLDemo {

    public void sqlInsert(SQLManager sqlManager) {
        // 同步SQL插入 （不使用try-catch的情况下，返回的数值可能为空。）
-        Long id = sqlManager.createInsert("users")
+        int id = sqlManager.createInsert("users")
                .setColumnNames("username", "phone", "email", "registerTime")
                .setParams("CarmJos", "18888888888", "carm@carm.cc", TimeDateUtils.getCurrentTime())
-                .setReturnGeneratedKey(true)// 设定在后续返回自增主键
+                .returnGeneratedKey() // 设定在后续返回自增主键
                .execute((exception, action) -> {
                    // 处理异常
                    System.out.println("#" + action.getShortID() + " -> " + action.getSQLContent());
@@ -145,7 +145,7 @@ public class EasySQLDemo {
                });

        try {
-            Long userID = sqlManager.createInsert("users")
+            int userID = sqlManager.createInsert("users")
                    .setColumnNames("username", "phone", "email", "registerTime")
                    .setParams("CarmJos", "18888888888", "carm@carm.cc", TimeDateUtils.getCurrentTime())
                    .returnGeneratedKey().execute();
@@ -6,6 +6,8 @@ import cc.carm.lib.easysql.tests.*;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import org.jetbrains.annotations.NotNull;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;

 import java.util.LinkedHashSet;
@@ -13,16 +15,29 @@ import java.util.Set;

 public class EasySQLTest {

+    protected SQLManager sqlManager;

-    @Test
-    public void onTest() {
-
+    @Before
+    public void initDatabase() {
        HikariConfig config = new HikariConfig();
        config.setDriverClassName("org.h2.Driver");
        config.setJdbcUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;MODE=MYSQL;");

-        SQLManager sqlManager = new SQLManagerImpl(new HikariDataSource(config), "test");
-        sqlManager.setDebugMode(true);
+        this.sqlManager = new SQLManagerImpl(new HikariDataSource(config), "test");
+        this.sqlManager.setDebugMode(true);
+    }
+
+    @After
+    public void shutdownDatabase() {
+        if (sqlManager.getDataSource() instanceof HikariDataSource) {
+            //Close bee connection pool
+            ((HikariDataSource) sqlManager.getDataSource()).close();
+        }
+    }
+
+
+    @Test
+    public void onTest() {

        print("加载测试类...");
        Set<TestHandler> tests = new LinkedHashSet<>();
@@ -30,11 +45,12 @@ public class EasySQLTest {
 //		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 QueryCloseTest());
        tests.add(new QueryFunctionTest());
-        tests.add(new DeleteTest());
+//        tests.add(new DeleteTest());

        print("准备进行测试...");

@@ -61,10 +77,6 @@ public class EasySQLTest {
                success, (tests.size() - success)
        );

-        if (sqlManager.getDataSource() instanceof HikariDataSource) {
-            //Close bee connection pool
-            ((HikariDataSource) sqlManager.getDataSource()).close();
-        }

    }

@@ -1,9 +1,10 @@
 package cc.carm.lib.easysql.tests;

+import cc.carm.lib.easysql.TestHandler;
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.SQLQuery;
-import cc.carm.lib.easysql.TestHandler;

+import java.math.BigInteger;
 import java.sql.ResultSet;
 import java.sql.SQLException;

@@ -24,7 +25,7 @@ public class QueryCloseTest extends TestHandler {

                System.out.printf(
                        "id: %d username: %s%n",
-                        resultSet.getInt("id"),
+                        resultSet.getObject("id", BigInteger.class),
                        resultSet.getString("username")
                );

@@ -16,6 +16,11 @@ public class QueryFunctionTest extends TestHandler {
                .orderBy("id", false)
                .setLimit(1)
                .build().executeFunction(query -> {
+                    try {
+                        Thread.sleep(1000L);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
                    if (!query.getResultSet().next()) return -1;
                    else return query.getResultSet().getInt("id");
                });
@@ -1,12 +1,13 @@
 package cc.carm.lib.easysql.tests;

+import cc.carm.lib.easysql.TestHandler;
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.SQLQuery;
-import cc.carm.lib.easysql.TestHandler;

 import java.sql.ResultSet;
 import java.sql.SQLException;

+@SuppressWarnings("resource")
 public class QueryNotCloseTest extends TestHandler {

    @Override
@@ -1,7 +1,7 @@
 package cc.carm.lib.easysql.tests;

-import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.TestHandler;
+import cc.carm.lib.easysql.api.SQLManager;

 import java.sql.SQLException;
 import java.util.Arrays;
@@ -28,6 +28,7 @@ public class SQLUpdateBatchTests extends TestHandler {
        List<Long> updates = sqlManager.createInsertBatch("test_user_table")
                .setColumnNames("uuid", "username", "age")
                .setAllParams(generateParams())
+                .returnGeneratedKeys(Long.class)
                .execute();

        System.out.println("changes " + Arrays.toString(updates.toArray()));
@@ -11,10 +11,10 @@ public class SQLUpdateReturnKeysTest extends SQLUpdateBatchTests {

    @Override
    public void onTest(SQLManager sqlManager) throws SQLException {
-        List<Long> generatedKeys = sqlManager.createInsertBatch("test_user_table")
+        List<Integer> generatedKeys = sqlManager.createInsertBatch("test_user_table")
                .setColumnNames("uuid", "username", "age")
                .setAllParams(generateParams())
-                .returnGeneratedKeys()
+                .returnGeneratedKeys(Integer.class)
                .execute();

        System.out.println("generated " + Arrays.toString(generatedKeys.toArray()));
@@ -1,8 +1,8 @@
 package cc.carm.lib.easysql.tests;

+import cc.carm.lib.easysql.TestHandler;
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.enums.NumberType;
-import cc.carm.lib.easysql.TestHandler;

 import java.sql.SQLException;

@@ -1,9 +1,9 @@
 package cc.carm.lib.easysql.tests;

+import cc.carm.lib.easysql.TestHandler;
 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.TestHandler;

 import java.sql.SQLException;

@@ -1,7 +1,7 @@
 package cc.carm.lib.easysql.tests;

-import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.TestHandler;
+import cc.carm.lib.easysql.api.SQLManager;

 import java.sql.SQLException;

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="cc.carm.lib.easysql.EasySQLTest">
+    <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{nolookups}%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <OnStartupTriggeringPolicy/>
+            </Policies>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL"/>
+                <RegexFilter regex=".*\$\{[^}]*\}.*" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </filters>
+            <AppenderRef ref="File"/>
+            <appender-ref ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
+
@@ -5,13 +5,13 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.13</version>
+        <version>0.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
@@ -81,10 +81,6 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-            </plugin>
        </plugins>
    </build>

@@ -10,35 +10,36 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;

 public abstract class AbstractSQLAction<T> implements SQLAction<T> {

    protected final @NotNull String sqlContent;
    private final @NotNull SQLManagerImpl sqlManager;
    private final @NotNull UUID uuid;
-    private final long createTime;
+    private final long createNanoTime;

    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql) {
-        this(manager, sql, System.currentTimeMillis());
+        this(manager, sql, System.nanoTime());
    }

    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql, @NotNull UUID uuid) {
-        this(manager, sql, uuid, System.currentTimeMillis());
+        this(manager, sql, uuid, System.nanoTime());
    }

-    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql, long createTime) {
-        this(manager, sql, UUID.randomUUID(), createTime);
+    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql, long createNanoTime) {
+        this(manager, sql, UUID.randomUUID(), createNanoTime);
    }

    public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql,
-                             @NotNull UUID uuid, long createTime) {
+                             @NotNull UUID uuid, long createNanoTime) {
        Objects.requireNonNull(manager);
        Objects.requireNonNull(sql);
        Objects.requireNonNull(uuid);
        this.sqlManager = manager;
        this.sqlContent = sql;
        this.uuid = uuid;
-        this.createTime = createTime;
+        this.createNanoTime = createNanoTime;
    }


@@ -53,8 +54,8 @@ public abstract class AbstractSQLAction<T> implements SQLAction<T> {
    }

    @Override
-    public long getCreateTime() {
-        return this.createTime;
+    public long getCreateTime(TimeUnit unit) {
+        return unit.convert(createNanoTime, TimeUnit.NANOSECONDS);
    }

    @Override
@@ -69,7 +70,11 @@ public abstract class AbstractSQLAction<T> implements SQLAction<T> {

    protected void debugMessage(List<Object[]> params) {
        if (getManager().isDebugMode()) {
-            getManager().getDebugHandler().beforeExecute(this, params);
+            try {
+                getManager().getDebugHandler().beforeExecute(this, params);
+            } catch (Exception exception) {
+                exception.printStackTrace();
+            }
        }
    }

@@ -12,22 +12,33 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;

-public class PreparedSQLBatchUpdateActionImpl
-        extends AbstractSQLAction<List<Long>>
-        implements PreparedSQLUpdateBatchAction {
+public class PreparedSQLBatchUpdateActionImpl<T extends Number>
+        extends AbstractSQLAction<List<T>>
+        implements PreparedSQLUpdateBatchAction<T> {

    boolean returnKeys = false;
-    @NotNull List<Object[]> allParams;
+    @NotNull List<Object[]> allParams = new ArrayList<>();

-    public PreparedSQLBatchUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
+    protected final @NotNull Class<T> numberClass;
+
+    public PreparedSQLBatchUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                                            @NotNull String sql) {
        super(manager, sql);
+        this.numberClass = numberClass;
        this.allParams = new ArrayList<>();
    }

+    public PreparedSQLBatchUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                                            @NotNull UUID uuid, @NotNull String sql) {
+        super(manager, sql, uuid);
+        this.numberClass = numberClass;
+    }
+
    @Override
-    public PreparedSQLUpdateBatchAction setAllParams(Iterable<Object[]> allParams) {
+    public PreparedSQLBatchUpdateActionImpl<T> setAllParams(Iterable<Object[]> allParams) {
        List<Object[]> paramsList = new ArrayList<>();
        allParams.forEach(paramsList::add);
        this.allParams = paramsList;
@@ -35,35 +46,40 @@ public class PreparedSQLBatchUpdateActionImpl
    }

    @Override
-    public PreparedSQLUpdateBatchAction addParamsBatch(Object... params) {
+    public PreparedSQLBatchUpdateActionImpl<T> addParamsBatch(Object... params) {
        this.allParams.add(params);
        return this;
    }

    @Override
-    public PreparedSQLUpdateBatchAction setReturnGeneratedKeys(boolean returnGeneratedKey) {
-        this.returnKeys = returnGeneratedKey;
+    public PreparedSQLBatchUpdateActionImpl<T> returnGeneratedKeys() {
+        this.returnKeys = true;
        return this;
    }

    @Override
-    public @NotNull List<Long> execute() throws SQLException {
+    public <N extends Number> PreparedSQLBatchUpdateActionImpl<N> returnGeneratedKeys(Class<N> keyTypeClass) {
+        return new PreparedSQLBatchUpdateActionImpl<>(getManager(), keyTypeClass, getActionUUID(), getSQLContent())
+                .setAllParams(allParams).returnGeneratedKeys();
+    }
+
+    @Override
+    public @NotNull List<T> execute() throws SQLException {
        debugMessage(allParams);

        try (Connection connection = getManager().getConnection()) {
            try (PreparedStatement statement = StatementUtil.createPrepareStatementBatch(
                    connection, getSQLContent(), allParams, returnKeys
            )) {
-
                int[] executed = statement.executeBatch();

                if (!returnKeys) {
-                    return Arrays.stream(executed).mapToLong(Long::valueOf).boxed().collect(Collectors.toList());
+                    return Arrays.stream(executed).mapToObj(numberClass::cast).collect(Collectors.toList());
                } else {
                    try (ResultSet resultSet = statement.getGeneratedKeys()) {
-                        List<Long> generatedKeys = new ArrayList<>();
+                        List<T> generatedKeys = new ArrayList<>();
                        while (resultSet.next()) {
-                            generatedKeys.add(resultSet.getLong(1));
+                            generatedKeys.add(resultSet.getObject(1, numberClass));
                        }
                        return generatedKeys;
                    }
@@ -1,6 +1,7 @@
 package cc.carm.lib.easysql.action;

 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
+import cc.carm.lib.easysql.api.action.SQLUpdateAction;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import cc.carm.lib.easysql.util.StatementUtil;
 import org.jetbrains.annotations.NotNull;
@@ -13,36 +14,45 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;

-public class PreparedSQLUpdateActionImpl
-        extends SQLUpdateActionImpl
-        implements PreparedSQLUpdateAction {
+public class PreparedSQLUpdateActionImpl<T extends Number>
+        extends SQLUpdateActionImpl<T>
+        implements PreparedSQLUpdateAction<T> {

    Object[] params;

-    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
-        this(manager, sql, (Object[]) null);
+    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                                       @NotNull String sql) {
+        this(manager, numberClass, sql, (Object[]) null);
    }

-    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
-                                       @Nullable List<Object> params) {
-        this(manager, sql, params == null ? null : params.toArray());
+    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                                       @NotNull String sql, @Nullable List<Object> params) {
+        this(manager, numberClass, sql, params == null ? null : params.toArray());
    }

-    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
-                                       @Nullable Object[] params) {
-        super(manager, sql);
+    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                                       @NotNull String sql, @Nullable Object[] params) {
+        super(manager, numberClass, sql);
+        this.params = params;
+    }
+
+    public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                                       @NotNull UUID uuid, @NotNull String sql,
+                                       Object[] params) {
+        super(manager, numberClass, uuid, sql);
        this.params = params;
    }

    @Override
-    public PreparedSQLUpdateActionImpl setParams(Object... params) {
+    public PreparedSQLUpdateActionImpl<T> setParams(Object... params) {
        this.params = params;
        return this;
    }

    @Override
-    public PreparedSQLUpdateAction setParams(@Nullable Iterable<Object> params) {
+    public PreparedSQLUpdateActionImpl<T> setParams(@Nullable Iterable<Object> params) {
        if (params == null) {
            return setParams((Object[]) null);
        } else {
@@ -53,7 +63,7 @@ public class PreparedSQLUpdateActionImpl
    }

    @Override
-    public @NotNull Long execute() throws SQLException {
+    public @NotNull T execute() throws SQLException {
        debugMessage(Collections.singletonList(params));

        try (Connection connection = getManager().getConnection()) {
@@ -63,10 +73,10 @@ public class PreparedSQLUpdateActionImpl
            )) {

                int changes = statement.executeUpdate();
-                if (!returnGeneratedKeys) return (long) changes;
+                if (!returnGeneratedKeys) return numberClass.cast(changes);
                else {
                    try (ResultSet resultSet = statement.getGeneratedKeys()) {
-                        return resultSet.next() ? resultSet.getLong(1) : -1;
+                        return resultSet.next() ? resultSet.getObject(1, numberClass) : numberClass.cast(0);
                    }
                }

@@ -75,4 +85,10 @@ public class PreparedSQLUpdateActionImpl

    }

+    @Override
+    public <N extends Number> SQLUpdateAction<N> returnGeneratedKey(Class<N> keyTypeClass) {
+        PreparedSQLUpdateActionImpl<N> newAction = new PreparedSQLUpdateActionImpl<>(getManager(), keyTypeClass, getActionUUID(), getSQLContent(), params);
+        newAction.returnGeneratedKey();
+        return newAction;
+    }
 }
@@ -9,42 +9,57 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.UUID;

-public class SQLUpdateActionImpl
-        extends AbstractSQLAction<Long>
-        implements SQLUpdateAction {
+public class SQLUpdateActionImpl<T extends Number>
+        extends AbstractSQLAction<T>
+        implements SQLUpdateAction<T> {

-    boolean returnGeneratedKeys = false;
+    protected final @NotNull Class<T> numberClass;

-    public SQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
+    protected boolean returnGeneratedKeys = false;
+
+    public SQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                               @NotNull String sql) {
        super(manager, sql);
+        this.numberClass = numberClass;
+    }
+
+    public SQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull Class<T> numberClass,
+                               @NotNull UUID uuid, @NotNull String sql) {
+        super(manager, sql, uuid);
+        this.numberClass = numberClass;
    }

    @Override
-    public @NotNull Long execute() throws SQLException {
+    public @NotNull T execute() throws SQLException {
        debugMessage(new ArrayList<>());

        try (Connection connection = getManager().getConnection()) {
            try (Statement statement = connection.createStatement()) {

                if (!returnGeneratedKeys) {
-                    return (long) statement.executeUpdate(getSQLContent());
+                    return numberClass.cast(statement.executeUpdate(getSQLContent()));
                } else {
                    statement.executeUpdate(getSQLContent(), Statement.RETURN_GENERATED_KEYS);

                    try (ResultSet resultSet = statement.getGeneratedKeys()) {
-                        return resultSet.next() ? resultSet.getLong(1) : -1;
+                        return resultSet.next() ? resultSet.getObject(1, numberClass) : numberClass.cast(0);
                    }
                }
            }
        }
    }

-
    @Override
-    public SQLUpdateAction setReturnGeneratedKey(boolean returnGeneratedKey) {
-        this.returnGeneratedKeys = returnGeneratedKey;
+    public SQLUpdateAction<T> returnGeneratedKey() {
+        this.returnGeneratedKeys = true;
        return this;
    }

+    @Override
+    public <N extends Number> SQLUpdateAction<N> returnGeneratedKey(Class<N> keyTypeClass) {
+        return new SQLUpdateActionImpl<>(getManager(), keyTypeClass, getActionUUID(), getSQLContent()).returnGeneratedKey();
+    }
+
 }
@@ -51,7 +51,7 @@ public class PreparedQueryActionImpl extends QueryActionImpl implements Prepared
    @Override
    public @NotNull SQLQueryImpl execute() throws SQLException {
        debugMessage(Collections.singletonList(params));
-        
+
        Connection connection = getManager().getConnection();
        PreparedStatement preparedStatement;
        try {
@@ -67,12 +67,10 @@ public class PreparedQueryActionImpl extends QueryActionImpl implements Prepared
        }

        try {
-            long executeTime = System.currentTimeMillis();
            SQLQueryImpl query = new SQLQueryImpl(
                    getManager(), this,
                    connection, preparedStatement,
-                    preparedStatement.executeQuery(),
-                    executeTime
+                    preparedStatement.executeQuery()
            );
            getManager().getActiveQuery().put(getActionUUID(), query);
            return query;
@@ -35,12 +35,10 @@ public class QueryActionImpl extends AbstractSQLAction<SQLQuery> implements Quer
        }

        try {
-            long executeTime = System.currentTimeMillis();
            SQLQueryImpl query = new SQLQueryImpl(
                    getManager(), this,
                    connection, statement,
-                    statement.executeQuery(getSQLContent()),
-                    executeTime
+                    statement.executeQuery(getSQLContent())
            );
            getManager().getActiveQuery().put(getActionUUID(), query);

@@ -48,6 +48,16 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
        return getThis();
    }

+    @Override
+    public B addCondition(@NotNull String columnName, @Nullable Object queryValue) {
+        Objects.requireNonNull(columnName, "columnName could not be null");
+        if (queryValue == null) {
+            return addCondition(withBackQuote(columnName) + " IS NULL");
+        } else {
+            return addCondition(columnName, "=", queryValue);
+        }
+    }
+
    @Override
    public B addCondition(
            @NotNull String columnName, @NotNull String operator, @Nullable Object queryValue
@@ -12,7 +12,7 @@ import java.util.Objects;
 import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;

 public class DeleteBuilderImpl
-        extends AbstractConditionalBuilder<DeleteBuilder, SQLAction<Long>>
+        extends AbstractConditionalBuilder<DeleteBuilder, SQLAction<Integer>>
        implements DeleteBuilder {

    protected final String tableName;
@@ -24,7 +24,7 @@ public class DeleteBuilderImpl
    }

    @Override
-    public PreparedSQLUpdateAction build() {
+    public PreparedSQLUpdateAction<Integer> build() {

        StringBuilder sqlBuilder = new StringBuilder();

@@ -33,9 +33,9 @@ public class DeleteBuilderImpl
        if (hasConditions()) sqlBuilder.append(" ").append(buildConditionSQL());
        if (limit > 0) sqlBuilder.append(" ").append(buildLimitSQL());

-        return new PreparedSQLUpdateActionImpl(
-                getManager(), sqlBuilder.toString(),
-                hasConditionParams() ? getConditionParams() : null
+        return new PreparedSQLUpdateActionImpl<>(
+                getManager(), Integer.class, sqlBuilder.toString(),
+                (hasConditionParams() ? getConditionParams() : null)
        );
    }

@@ -28,31 +28,25 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> renameTo(@NotNull String newTableName) {
+    public SQLAction<Integer> renameTo(@NotNull String newTableName) {
        Objects.requireNonNull(newTableName, "table name could not be null");
-        return new SQLUpdateActionImpl(getManager(),
-                "ALTER TABLE " + withBackQuote(tableName) + " RENAME TO " + withBackQuote(newTableName)
-        );
+        return createAction("ALTER TABLE " + withBackQuote(tableName) + " RENAME TO " + withBackQuote(newTableName));
    }

    @Override
-    public SQLAction<Long> changeComment(@NotNull String newTableComment) {
+    public SQLAction<Integer> changeComment(@NotNull String newTableComment) {
        Objects.requireNonNull(newTableComment, "table comment could not be null");
-        return new SQLUpdateActionImpl(getManager(),
-                "ALTER TABLE " + withBackQuote(getTableName()) + " COMMENT " + withQuote(newTableComment)
-        );
+        return createAction("ALTER TABLE " + withBackQuote(getTableName()) + " COMMENT " + withQuote(newTableComment));
    }

    @Override
-    public SQLAction<Long> setAutoIncrementIndex(int index) {
-        return new SQLUpdateActionImpl(getManager(),
-                "ALTER TABLE " + withBackQuote(getTableName()) + " AUTO_INCREMENT=" + index
-        );
+    public SQLAction<Integer> setAutoIncrementIndex(int index) {
+        return createAction("ALTER TABLE " + withBackQuote(getTableName()) + " AUTO_INCREMENT=" + index);
    }

    @Override
-    public SQLAction<Long> addIndex(@NotNull IndexType indexType, @Nullable String indexName,
-                                    @NotNull String columnName, @NotNull String... moreColumns) {
+    public SQLAction<Integer> addIndex(@NotNull IndexType indexType, @Nullable String indexName,
+                                       @NotNull String columnName, @NotNull String... moreColumns) {
        Objects.requireNonNull(indexType, "indexType could not be null");
        Objects.requireNonNull(columnName, "column names could not be null");
        Objects.requireNonNull(moreColumns, "column names could not be null");
@@ -63,7 +57,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> dropIndex(@NotNull String indexName) {
+    public SQLAction<Integer> dropIndex(@NotNull String indexName) {
        Objects.requireNonNull(indexName, "indexName could not be null");
        return createAction(
                "ALTER TABLE " + withBackQuote(getTableName()) + " DROP INDEX " + withBackQuote(indexName)
@@ -71,7 +65,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> dropForeignKey(@NotNull String keySymbol) {
+    public SQLAction<Integer> dropForeignKey(@NotNull String keySymbol) {
        Objects.requireNonNull(keySymbol, "keySymbol could not be null");
        return createAction(
                "ALTER TABLE " + withBackQuote(getTableName()) + " DROP FOREIGN KEY " + withBackQuote(keySymbol)
@@ -79,14 +73,14 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> dropPrimaryKey() {
+    public SQLAction<Integer> dropPrimaryKey() {
        return createAction(
                "ALTER TABLE " + withBackQuote(getTableName()) + " DROP PRIMARY KEY"
        );
    }

    @Override
-    public SQLAction<Long> addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn) {
+    public SQLAction<Integer> addColumn(@NotNull String columnName, @NotNull String settings, @Nullable String afterColumn) {
        Objects.requireNonNull(columnName, "columnName could not be null");
        Objects.requireNonNull(settings, "settings could not be null");
        String orderSettings = null;
@@ -105,7 +99,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> renameColumn(@NotNull String columnName, @NotNull String newName) {
+    public SQLAction<Integer> renameColumn(@NotNull String columnName, @NotNull String newName) {
        Objects.requireNonNull(columnName, "columnName could not be null");
        Objects.requireNonNull(newName, "please specify new column name");
        return createAction(
@@ -114,7 +108,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> modifyColumn(@NotNull String columnName, @NotNull String settings) {
+    public SQLAction<Integer> modifyColumn(@NotNull String columnName, @NotNull String settings) {
        Objects.requireNonNull(columnName, "columnName could not be null");
        Objects.requireNonNull(settings, "please specify new column settings");
        return createAction(
@@ -123,7 +117,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> removeColumn(@NotNull String columnName) {
+    public SQLAction<Integer> removeColumn(@NotNull String columnName) {
        Objects.requireNonNull(columnName, "columnName could not be null");
        return createAction(
                "ALTER TABLE " + withBackQuote(getTableName()) + " DROP " + withBackQuote(columnName)
@@ -131,7 +125,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> setColumnDefault(@NotNull String columnName, @NotNull String defaultValue) {
+    public SQLAction<Integer> setColumnDefault(@NotNull String columnName, @NotNull String defaultValue) {
        Objects.requireNonNull(columnName, "columnName could not be null");
        Objects.requireNonNull(defaultValue, "defaultValue could not be null, if you need to remove the default value, please use #removeColumnDefault().");
        return createAction(
@@ -140,14 +134,14 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
    }

    @Override
-    public SQLAction<Long> removeColumnDefault(@NotNull String columnName) {
+    public SQLAction<Integer> removeColumnDefault(@NotNull String columnName) {
        Objects.requireNonNull(columnName, "columnName could not be null");
        return createAction(
                "ALTER TABLE " + withBackQuote(getTableName()) + " ALTER " + withBackQuote(columnName) + " DROP DEFAULT"
        );
    }

-    private SQLUpdateActionImpl createAction(@NotNull String sql) {
-        return new SQLUpdateActionImpl(getManager(), sql);
+    private SQLUpdateActionImpl<Integer> createAction(@NotNull String sql) {
+        return new SQLUpdateActionImpl<>(getManager(), Integer.class, sql);
    }
 }
@@ -75,7 +75,7 @@ public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableC
    }

    @Override
-    public SQLUpdateAction build() {
+    public SQLUpdateAction<Integer> build() {
        StringBuilder createSQL = new StringBuilder();
        createSQL.append("CREATE TABLE IF NOT EXISTS ").append(withBackQuote(tableName));
        createSQL.append("(");
@@ -94,7 +94,7 @@ public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableC
            createSQL.append(" COMMENT ").append(withQuote(tableComment));
        }

-        return new SQLUpdateActionImpl(getManager(), createSQL.toString());
+        return new SQLUpdateActionImpl<>(getManager(), Integer.class, createSQL.toString());
    }

    @Override
@@ -13,7 +13,7 @@ import java.util.*;
 import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;

 public class UpdateBuilderImpl
-        extends AbstractConditionalBuilder<UpdateBuilder, SQLAction<Long>>
+        extends AbstractConditionalBuilder<UpdateBuilder, SQLAction<Integer>>
        implements UpdateBuilder {

    protected final @NotNull String tableName;
@@ -27,7 +27,7 @@ public class UpdateBuilderImpl
    }

    @Override
-    public PreparedSQLUpdateAction build() {
+    public PreparedSQLUpdateAction<Integer> build() {

        StringBuilder sqlBuilder = new StringBuilder();

@@ -47,7 +47,7 @@ public class UpdateBuilderImpl

        if (limit > 0) sqlBuilder.append(" ").append(buildLimitSQL());

-        return new PreparedSQLUpdateActionImpl(getManager(), sqlBuilder.toString(), allParams);
+        return new PreparedSQLUpdateActionImpl<>(getManager(), Integer.class, sqlBuilder.toString(), allParams);
    }

    @Override
@@ -120,20 +120,18 @@ public class SQLManagerImpl implements SQLManager {
    }

    @Override
-    public Long executeSQL(String sql) {
-        return new SQLUpdateActionImpl(this, sql).execute(null);
+    public Integer executeSQL(String sql) {
+        return new SQLUpdateActionImpl<>(this, Integer.class, sql).execute(null);
    }

    @Override
-    public Long executeSQL(String sql, Object[] params) {
-        return new PreparedSQLUpdateActionImpl(this, sql, params).execute(null);
+    public Integer executeSQL(String sql, Object[] params) {
+        return new PreparedSQLUpdateActionImpl<>(this, Integer.class, sql, params).execute(null);
    }

    @Override
-    public List<Long> executeSQLBatch(String sql, Iterable<Object[]> paramsBatch) {
-        return new PreparedSQLBatchUpdateActionImpl(this, sql)
-                .setAllParams(paramsBatch)
-                .execute(null);
+    public List<Integer> executeSQLBatch(String sql, Iterable<Object[]> paramsBatch) {
+        return new PreparedSQLBatchUpdateActionImpl<>(this, Integer.class, sql).setAllParams(paramsBatch).execute(null);
    }

    @Override
@@ -174,41 +172,41 @@ public class SQLManagerImpl implements SQLManager {
    }

    @Override
-    public InsertBuilder<PreparedSQLUpdateBatchAction> createInsertBatch(@NotNull String tableName) {
-        return new InsertBuilderImpl<PreparedSQLUpdateBatchAction>(this, tableName) {
+    public InsertBuilder<PreparedSQLUpdateBatchAction<Integer>> createInsertBatch(@NotNull String tableName) {
+        return new InsertBuilderImpl<PreparedSQLUpdateBatchAction<Integer>>(this, tableName) {
            @Override
-            public PreparedSQLUpdateBatchAction setColumnNames(List<String> columnNames) {
-                return new PreparedSQLBatchUpdateActionImpl(getManager(), buildSQL(getTableName(), columnNames));
+            public PreparedSQLUpdateBatchAction<Integer> setColumnNames(List<String> columnNames) {
+                return new PreparedSQLBatchUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
            }
        };
    }

    @Override
-    public InsertBuilder<PreparedSQLUpdateAction> createInsert(@NotNull String tableName) {
-        return new InsertBuilderImpl<PreparedSQLUpdateAction>(this, tableName) {
+    public InsertBuilder<PreparedSQLUpdateAction<Integer>> createInsert(@NotNull String tableName) {
+        return new InsertBuilderImpl<PreparedSQLUpdateAction<Integer>>(this, tableName) {
            @Override
-            public PreparedSQLUpdateAction setColumnNames(List<String> columnNames) {
-                return new PreparedSQLUpdateActionImpl(getManager(), buildSQL(getTableName(), columnNames));
+            public PreparedSQLUpdateAction<Integer> setColumnNames(List<String> columnNames) {
+                return new PreparedSQLUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
            }
        };
    }

    @Override
-    public ReplaceBuilder<PreparedSQLUpdateBatchAction> createReplaceBatch(@NotNull String tableName) {
-        return new ReplaceBuilderImpl<PreparedSQLUpdateBatchAction>(this, tableName) {
+    public ReplaceBuilder<PreparedSQLUpdateBatchAction<Integer>> createReplaceBatch(@NotNull String tableName) {
+        return new ReplaceBuilderImpl<PreparedSQLUpdateBatchAction<Integer>>(this, tableName) {
            @Override
-            public PreparedSQLUpdateBatchAction setColumnNames(List<String> columnNames) {
-                return new PreparedSQLBatchUpdateActionImpl(getManager(), buildSQL(getTableName(), columnNames));
+            public PreparedSQLUpdateBatchAction<Integer> setColumnNames(List<String> columnNames) {
+                return new PreparedSQLBatchUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
            }
        };
    }

    @Override
-    public ReplaceBuilder<PreparedSQLUpdateAction> createReplace(@NotNull String tableName) {
-        return new ReplaceBuilderImpl<PreparedSQLUpdateAction>(this, tableName) {
+    public ReplaceBuilder<PreparedSQLUpdateAction<Integer>> createReplace(@NotNull String tableName) {
+        return new ReplaceBuilderImpl<PreparedSQLUpdateAction<Integer>>(this, tableName) {
            @Override
-            public PreparedSQLUpdateAction setColumnNames(List<String> columnNames) {
-                return new PreparedSQLUpdateActionImpl(getManager(), buildSQL(getTableName(), columnNames));
+            public PreparedSQLUpdateAction<Integer> setColumnNames(List<String> columnNames) {
+                return new PreparedSQLUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
            }
        };
    }
@@ -8,22 +8,23 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.concurrent.TimeUnit;

 public class SQLQueryImpl implements SQLQuery {

    protected final long executeTime;

    protected final SQLManagerImpl sqlManager;
-    final Connection connection;
-    final Statement statement;
-    final ResultSet resultSet;
+    protected final Connection connection;
+    protected final Statement statement;
+    protected final ResultSet resultSet;
    protected QueryActionImpl queryAction;

    public SQLQueryImpl(
            SQLManagerImpl sqlManager, QueryActionImpl queryAction,
            Connection connection, Statement statement, ResultSet resultSet
    ) {
-        this(sqlManager, queryAction, connection, statement, resultSet, System.currentTimeMillis());
+        this(sqlManager, queryAction, connection, statement, resultSet, System.nanoTime());
    }

    public SQLQueryImpl(
@@ -40,8 +41,8 @@ public class SQLQueryImpl implements SQLQuery {
    }

    @Override
-    public long getExecuteTime() {
-        return this.executeTime;
+    public long getExecuteTime(TimeUnit timeUnit) {
+        return timeUnit.convert(this.executeTime, TimeUnit.NANOSECONDS);
    }

    @Override
@@ -72,7 +73,11 @@ public class SQLQueryImpl implements SQLQuery {
            if (getConnection() != null && !getConnection().isClosed()) getConnection().close();

            if (getManager().isDebugMode()) {
-                getManager().getDebugHandler().afterQuery(this, getExecuteTime(), System.currentTimeMillis());
+                try {
+                    getManager().getDebugHandler().afterQuery(this, getExecuteTime(TimeUnit.NANOSECONDS), System.nanoTime());
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
            }
            getManager().getActiveQuery().remove(getAction().getActionUUID());
        } catch (SQLException e) {
@@ -5,11 +5,13 @@
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <java.version>8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <jdk.version>8</jdk.version>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.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>
        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
    </properties>
@@ -17,7 +19,7 @@
    <groupId>cc.carm.lib</groupId>
    <artifactId>easysql-parent</artifactId>
    <packaging>pom</packaging>
-    <version>0.3.13</version>
+    <version>0.4.0</version>

    <modules>
        <module>api</module>
@@ -26,7 +28,7 @@
        <module>with-pool/beecp</module>
        <module>with-pool/hikaricp</module>

-        <module>example/demo</module>
+        <module>demo</module>
    </modules>

    <name>EasySQL</name>
@@ -94,14 +96,12 @@
    </repositories>

    <distributionManagement>
-
        <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>

    <dependencies>
@@ -169,7 +169,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.2</version>
+                    <version>3.4.0</version>
                    <configuration>
                        <classifier>javadoc</classifier>
                        <detectJavaApiLink>false</detectJavaApiLink>
@@ -198,8 +198,8 @@
                    <artifactId>maven-compiler-plugin</artifactId>
                    <version>3.10.1</version>
                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
+                        <source>${jdk.version}</source>
+                        <target>${jdk.version}</target>
                        <encoding>UTF-8</encoding>
                        <compilerArgument>-parameters</compilerArgument>
                    </configuration>
@@ -302,6 +302,20 @@
            </distributionManagement>
        </profile>

+        <profile>
+            <id>local</id>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>localRepository</id>
+                    <url>file:${user.home}/local-deploy/</url>
+                </snapshotRepository>
+                <repository>
+                    <id>localRepository</id>
+                    <url>file:${user.home}/local-deploy/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+
    </profiles>

 </project>
@@ -5,14 +5,14 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.13</version>
+        <version>0.4.0</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
@@ -40,6 +40,12 @@
        <license>
            <name>The MIT License</name>
            <url>https://opensource.org/licenses/MIT</url>
+            <comments>EasySQL的基础源代码采用MIT开源协议。</comments>
+        </license>
+        <license>
+            <name>GNU Lesser General Public License v2.1</name>
+            <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
+            <comments>该版本打包了BeeCP，因此相关代码继续遵循LGPL协议。</comments>
        </license>
    </licenses>

@@ -73,7 +79,7 @@
            <!--项目地址 https://github.com/Chris2018998/BeeCP  -->
            <groupId>com.github.chris2018998</groupId>
            <artifactId>beecp</artifactId>
-            <version>3.3.5</version>
+            <version>3.3.6</version>
            <optional>true</optional>
            <scope>compile</scope>
        </dependency>
@@ -5,14 +5,14 @@
    <parent>
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>0.3.13</version>
+        <version>0.4.0</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
@@ -39,6 +39,7 @@
        <license>
            <name>The MIT License</name>
            <url>https://opensource.org/licenses/MIT</url>
+            <comments>EasySQL与HikariCP均采用MIT开源协议。</comments>
        </license>
    </licenses>
Author	SHA1	Message	Date
carm	7d17324763	[0.4.0] 版本更新	2022-06-09 13:25:18 +08:00
carm	4be85f5481	feat(function): 添加 andThen 与 compose 方法。	2022-06-09 13:24:23 +08:00
carm	298a5c4e81	feat(keys): 现在可以自定义返回的自增主键类型。现在可以通过 returnGeneratedKey(Class<T> numberClass) 方法要求返回指定类型的自增主键。 BREAKING CHANGE: 移除了对于“是否返回主键”的选择，一旦定义了主键类型，就代表action将返回该类型的主键。	2022-06-09 12:12:11 +08:00
carm	9b4460f97a	fix(debug): 修复debug消息中耗时计算异常的问题	2022-06-06 18:18:26 +08:00
carm	f16b5f22e1	ci(deploy): 添加repo分支的相关介绍。	2022-06-03 03:24:01 +08:00
carm	1a4b5c245a	ci(deploy): 修改部署配置	2022-06-03 03:17:37 +08:00
carm	91d9891532	ci(deploy): 修改部署配置	2022-06-03 03:04:22 +08:00
carm	fdb7af541c	chore: 修改项目结构与部署方式	2022-06-02 21:53:12 +08:00
carm	b467743c2a	docs(repo): 修改依赖库地址介绍	2022-06-02 21:51:43 +08:00
carm	3979c6d50c	test(query): 添加SuppressWarnings标识	2022-06-02 21:42:34 +08:00
carm	9bac83f739	chore(project): 修改项目文件结构	2022-06-02 21:41:09 +08:00
carm	96ccc604ed	ci(reploy): 添加 local-deploy 配置	2022-05-30 04:37:02 +08:00
carm	90db463f1d	Merge remote-tracking branch 'origin/master'	2022-05-30 04:36:24 +08:00
carm	9248783a16	ci(reploy): 添加 local-deploy 配置	2022-05-30 04:36:10 +08:00
carm	75e8f02228	Merge pull request #47 from CarmJos/dependabot/maven/com.github.chris2018998-beecp-3.3.6 Bump beecp from 3.3.5 to 3.3.6	2022-05-02 21:13:11 +08:00
dependabot[bot]	02b8d561a8	Bump beecp from 3.3.5 to 3.3.6 Bumps [beecp](https://github.com/Chris2018998/BeeCP) from 3.3.5 to 3.3.6. - [Release notes](https://github.com/Chris2018998/BeeCP/releases) - [Commits](https://github.com/Chris2018998/BeeCP/compare/3.3.5...3.3.6) --- updated-dependencies: - dependency-name: com.github.chris2018998:beecp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-02 08:31:36 +00:00
carm	19490d7508	Merge remote-tracking branch 'origin/master'	2022-04-27 02:09:07 +08:00
carm	e8a01169d2	[0.3.16] 支持 IS NULL 判断(即设定queryValue为null)。	2022-04-27 02:08:58 +08:00
carm	2e1df7c7f6	Merge pull request #46 from CarmJos/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.4.0 Bump maven-javadoc-plugin from 3.3.2 to 3.4.0	2022-04-21 17:04:02 +08:00
dependabot[bot]	1812db3a16	Bump maven-javadoc-plugin from 3.3.2 to 3.4.0 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.2...maven-javadoc-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-21 08:31:13 +00:00
carm	deb5de35a8	移除api与impl的shaded	2022-04-17 17:23:49 +08:00
carm	e9ce0a769c	[0.3.15] 版本修复 - `[F]` 修复上一版本中 SQLDebugHandler 的处理出现空指针异常。	2022-04-13 08:04:30 +08:00
carm	e98e9586ef	[0.3.14] 版本修复 - `[F]` 修复上一版本中 SQLDebugHandler 的处理出现空指针异常。	2022-04-13 07:52:06 +08:00
carm	6cd080210f	[0.3.14] 版本修复 - `[F]` 修复上一版本中 SQLDebugHandler 的处理出现空指针异常。	2022-04-13 07:51:56 +08:00