fix(debug): 修复debug消息中耗时计算异常的问题

Bump beecp from 3.3.5 to 3.3.6

.documentation/REPOSITORY-README.md

@@ -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/' }
+}
+```

.github/workflows/deploy.yml

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

README.md

@@ -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) 开源协议。

api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.3.12</version>
+        <version>0.3.18</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>
 

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

@@ -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语句

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

@@ -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}

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

@@ -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);
 

api/src/main/java/cc/carm/lib/easysql/api/function/SQLDebugHandler.java

@@ -5,10 +5,12 @@ import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
 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;
 
 /**
  * 异常处理器。
@@ -24,54 +26,72 @@ public interface SQLDebugHandler {
      * @param params 执行传入的参数列表。
      *               实际上，仅有 {@link PreparedSQLUpdateAction} 和 {@link PreparedSQLUpdateBatchAction} 才会有传入参数。
      */
-    void beforeExecute(@NotNull SQLAction<?> action, @NotNull List<Object[]> params);
+    void beforeExecute(@NotNull SQLAction<?> action, @NotNull List<@Nullable Object[]> params);
 
     /**
      * 该方法将在 {@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<Object[]> params) {
+            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);
-                    logger.info("┣# SQLParams({}): {}", param.length, Arrays.stream(param).map(Object::toString).reduce((a, b) -> a + ", " + b).orElse(""));
+                    if (param != null) {
+                        logger.info("┣# SQLParam: {}", parseParams(param));
+                    }
                 } else if (params.size() > 1) {
                     logger.info("┣# SQLParams: ");
                     int i = 0;
                     for (Object[] param : params) {
-                        logger.info("┃ [{}] {}", ++i, Arrays.stream(param).map(Object::toString).reduce((a, b) -> a + ", " + b).orElse(""));
+                        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("┣# executeCote: {} ms", (closeTime - executeTime));
+                logger.info("┣# CloseTime: {}  (cost {} ms)",
+                        TimeUnit.NANOSECONDS.toMillis(closeNanoTime),
+                        ((double) (closeNanoTime - executeNanoTime) / 1000000)
+                );
                 logger.info("┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
             }
         };

demo/pom.xml

@@ -5,18 +5,19 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.12</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>0.3.18</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>
         <maven.deploy.skip>true</maven.deploy.skip>
+
+        <log4j.version>2.17.2</log4j.version>
     </properties>
 
     <artifactId>easysql-demo</artifactId>
@@ -80,6 +81,27 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -92,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>

demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java

@@ -22,6 +22,7 @@ public class EasySQLTest {
         config.setJdbcUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;MODE=MYSQL;");
 
         SQLManager sqlManager = new SQLManagerImpl(new HikariDataSource(config), "test");
+        sqlManager.setDebugMode(true);
 
         print("加载测试类...");
         Set<TestHandler> tests = new LinkedHashSet<>();
@@ -33,7 +34,7 @@ public class EasySQLTest {
         tests.add(new SQLUpdateBatchTests());
         tests.add(new SQLUpdateReturnKeysTest());
         tests.add(new QueryFunctionTest());
-        tests.add(new DeleteTest());
+//        tests.add(new DeleteTest());
 
         print("准备进行测试...");
 

demo/src/test/java/cc/carm/lib/easysql/tests/QueryCloseTest.java

@@ -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.SQLQuery;
-import cc.carm.lib.easysql.TestHandler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -29,6 +29,12 @@ public class QueryCloseTest extends TestHandler {
                 );
 
             }
+
+            try {
+                Thread.sleep(500L);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         }
 
     }

demo/src/test/java/cc/carm/lib/easysql/tests/QueryFunctionTest.java

@@ -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");
                 });

demo/src/test/java/cc/carm/lib/easysql/tests/QueryNotCloseTest.java

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

demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateBatchTests.java

@@ -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;

demo/src/test/java/cc/carm/lib/easysql/tests/TableAlterTest.java

@@ -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;
 

demo/src/test/java/cc/carm/lib/easysql/tests/TableCreateTest.java

@@ -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;
 

demo/src/test/java/cc/carm/lib/easysql/tests/TableRenameTest.java

@@ -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;
 

demo/src/test/resources/log4j2.xml

@@ -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>
+

impl/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.12</version>
+        <version>0.3.18</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>
 

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

@@ -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();
+            }
         }
     }
 

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

@@ -19,7 +19,7 @@ public class PreparedSQLBatchUpdateActionImpl
         implements PreparedSQLUpdateBatchAction {
 
     boolean returnKeys = false;
-    List<Object[]> allParams;
+    @NotNull List<Object[]> allParams;
 
     public PreparedSQLBatchUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql) {
         super(manager, sql);

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

@@ -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;

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

@@ -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);
 

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

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

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

@@ -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) {

pom.xml

@@ -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.12</version>
+    <version>0.3.18</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>

with-pool/beecp/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.12</version>
+        <version>0.3.18</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>

with-pool/hikaricp/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.3.12</version>
+        <version>0.3.18</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>