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

Bump maven-gpg-plugin from 1.6 to 3.0.1

.documentation/JAVADOC-README.md

@@ -4,6 +4,6 @@
 
 ## 如何实现？
 
-若您也想通过 [Github Actions](https://docs.github.com/en/actions/learn-github-actions) 
+若您也想通过 [Github Actions](https://docs.github.com/en/actions/learn-github-actions)
 自动部署项目的Javadoc到 [Github Pages](https://pages.github.com/) ，
 可以参考我的文章 [《自动部署Javadoc到Github Pages》](https://pages.carm.cc/doc/javadoc-in-github.html) 。

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [ CarmJos ]
+custom: [ 'https://donate.carm.cc' ]

.github/ISSUE_TEMPLATE/bugs_report.md

@@ -1,30 +1,37 @@
 ---
-name: 问题提交
-about: 提交并描述问题，帮助我们对其进行检查与修复。
+name: 问题提交 
+about: 描述问题并提交，帮助我们对其进行检查与修复。 
 title: ''
-labels: bug
+labels: bug 
 assignees: ''
 
 ---
 
-**问题简述**
+### **问题简述**
+
 用简短的话语描述一下大概问题。
 
-**问题来源**
+### **问题来源**
+
 描述一下通过哪些操作才发现的问题，如：
+
 1. 使用了 '...'
 2. 输入了 '....'
 3. 出现了报错 '....'
 
-**预期结果**(可选)
+### **预期结果** (可选)
+
 如果问题不发生，应该是什么情况
 
-**问题截图/问题报错**
+### **问题截图/问题报错**
+
 如果有报错或输出，请提供截图。
 
-**操作环境**
+### **操作环境**
+
 - 系统环境: `Windows 10` / `Ubuntu` / `...`
 - Java版本: `JDK11` / `OPENJDK8` / `JRE8` / `...`
 
-**其他补充**
+### **其他补充**
+
 如有其他补充，可以在这里描述。

.github/ISSUE_TEMPLATE/feature_issues.md

@@ -1,20 +1,23 @@
 ---
-name: 功能需求
-about: 希望我们提供更多的功能。
+name: 功能需求 
+about: 希望我们提供更多的功能。 
 title: ''
-labels: enhancement
+labels: enhancement 
 assignees: ''
-
 ---
 
-**功能简述**
+### **功能简述**
+
 简单的描述一下你想要的功能
 
-**需求来源**
+### **需求来源**
+
 简单的描述一下为什么需要这个功能。
 
-**功能参考**(可选)
+### **功能参考**(可选)
+
 如果有相关功能的参考，如文本、截图，请提供给我们。
 
-**附加内容**
+### **附加内容**
+
 如果有什么小细节需要重点注意，请在这里告诉我们。

.github/dependabot.yml

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

.github/gpg_public.key

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

.github/workflows/codacy-analysis.yml

@@ -11,7 +11,7 @@
 # For more information on Codacy Analysis CLI in general, see
 # https://github.com/codacy/codacy-analysis-cli.
 
-name: Codacy Security Scan
+name: "Codacy Security Scan"
 
 on:
   push:

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: "CodeQL Analysis"
 
 on:
   push:
@@ -37,34 +37,34 @@ jobs:
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/deploy.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Deploy
+name: "Project Deploy"
 
 on:
   # 支持手动触发构建
@@ -11,8 +11,8 @@ on:
     types: [ published ]
 
 jobs:
-  build:
-
+  gh-deploy:
+    name: "Publish Project (GitHub)"
     runs-on: ubuntu-latest
 
     steps:
@@ -26,8 +26,83 @@ jobs:
           server-id: github
           server-username: MAVEN_USERNAME
           server-password: MAVEN_TOKEN
-      - name: "Deploy"
-        run: mvn -B deploy --file pom.xml -DskipTests
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+
+      - name: "Maven Deploy With Javadoc"
+        run: mvn -B -Pgithub deploy --file pom.xml -DskipTests
         env:
           MAVEN_USERNAME: ${{ github.repository_owner }}
-          MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          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 easysql-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"
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: maven
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+
+      - name: "Central Deploy"
+        run: mvn -B -Possrh deploy --file pom.xml -DskipTests
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASS }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

.github/workflows/javadoc.yml

@@ -1,73 +0,0 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Javadoc
-
-on:
-  # 支持手动触发构建
-  workflow_dispatch:
-  release:
-    # 创建release的时候触发
-    types: [ published ]
-
-jobs:
-  api-website:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v2
-
-      - name: Set up the Java JDK
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-
-      - name: Generate docs
-        run: mvn clean package -DskipTests
-
-      - name: Copy to Location
-        run: |
-          rm -rf docs
-          mkdir -vp docs
-          cp -vrf easysql-api/target/apidocs/* docs/
-          cp -vrf .documentation/JAVADOC-README.md docs/README.md
-
-      - name: Generate the 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 documentation changes
-        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
-

.github/workflows/maven.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Build
+name: Project Build & Tests
 
 on:
   # 支持手动触发构建

.github/workflows/sonar-analyze.yml

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

LICENSE

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+MIT License
+
+Copyright (c) 2022 Carm
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -35,21 +35,41 @@
 
 ### 示例代码
 
-您可以 [点击这里](easysql-demo/src/main/java/EasySQLDemo.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。
+您可以 [点击这里](example/easysql-demo/src/main/java/EasySQLDemo.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。
 
-### 依赖方式 
+### 依赖方式
+
+#### Maven 依赖
 
 <details>
-<summary>远程库配置(Maven)</summary>
+<summary>远程库配置</summary>
 
 ```xml
+
 <project>
     <repositories>
+
         <repository>
-            <id>github</id>
+            <!--采用Maven中心库，安全稳定，但版本更新需要等待同步-->
+            <id>maven</id>
+            <name>Maven Central</name>
+            <url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
+        </repository>
+        
+        <repository>
+            <!--采用github依赖库，实时更新，但需要配置 (推荐) -->
+            <id>EasySQL</id>
             <name>GitHub Packages</name>
             <url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
         </repository>
+
+        <repository>
+            <!--采用我的私人依赖库，简单方便，但可能因为变故而无法使用-->
+            <id>carm-repo</id>
+            <name>Carm's Repo</name>
+            <url>https://repo.carm.cc/repository/maven-public/</url>
+        </repository>
+
     </repositories>
 </project>
 ```
@@ -57,9 +77,10 @@
 </details>
 
 <details>
-<summary>原生依赖(Maven)</summary>
+<summary>原生依赖</summary>
 
 ```xml
+
 <project>
     <dependencies>
         <!--对于需要提供公共接口的项目，可以仅打包API部分，方便他人调用-->
@@ -81,12 +102,14 @@
     </dependencies>
 </project>
 ```
+
 </details>
 
 <details>
-<summary>含连接池版本(Maven)</summary>
+<summary>含连接池版本</summary>
 
 ```xml
+
 <project>
     <dependencies>
         <!--也可直接选择打包了连接池的版本-->
@@ -108,6 +131,63 @@
 
 </details>
 
+#### Gradle 依赖
+
+<details>
+<summary>远程库配置</summary>
+
+```groovy
+repositories {
+
+    // 采用Maven中心库，安全稳定，但版本更新需要等待同步 
+    mavenCentral()
+    
+    // 采用github依赖库，实时更新，但需要配置 (推荐)
+    maven { url 'https://maven.pkg.github.com/CarmJos/EasySQL' }
+
+    // 采用我的私人依赖库，简单方便，但可能因为变故而无法使用
+    maven { url 'https://repo.carm.cc/repository/maven-public/' }
+}
+```
+
+</details>
+
+<details>
+<summary>原生依赖</summary>
+
+```groovy
+
+dependencies {
+
+    //对于需要提供公共接口的项目，可以仅打包API部分，方便他人调用
+    api "cc.carm.lib:easysql-api:[LATEST RELEASE]"
+
+    //如需自定义连接池，则可以仅打包实现部分，自行创建SQLManager
+    api "cc.carm.lib:easysql-impl:[LATEST RELEASE]"
+
+}
+```
+
+</details>
+
+<details>
+<summary>含连接池版本</summary>
+
+```groovy
+
+dependencies {
+
+    //也可直接选择打包了连接池的版本
+
+    api "cc.carm.lib:easysql-beecp:[LATEST RELEASE]"
+
+    api "cc.carm.lib:easysql-hikaricp:[LATEST RELEASE]"
+
+}
+```
+
+</details>
+
 ## 支持与捐赠
 
 若您觉得本插件做的不错，您可以通过捐赠支持我！
@@ -118,22 +198,20 @@
 
 ## 开源协议
 
-本项目源码采用 [GNU General Public License v3.0](https://opensource.org/licenses/GPL-3.0) 开源协议。
+本项目源码采用 [The MIT License](https://opensource.org/licenses/MIT) 开源协议。
 <details>
-<summary>关于 GPL 协议</summary>
+<summary>关于 MIT 协议</summary>
 
-> GNU General Public Licence (GPL) 有可能是开源界最常用的许可模式。GPL 保证了所有开发者的权利，同时为使用者提供了足够的复制，分发，修改的权利：
+> MIT 协议可能是几大开源协议中最宽松的一个，核心条款是：
 >
-> #### 可自由复制
-> 你可以将软件复制到你的电脑，你客户的电脑，或者任何地方。复制份数没有任何限制。
-> #### 可自由分发
-> 在你的网站提供下载，拷贝到U盘送人，或者将源代码打印出来从窗户扔出去（环保起见，请别这样做）。
-> #### 可以用来盈利
-> 你可以在分发软件的时候收费，但你必须在收费前向你的客户提供该软件的 GNU GPL 许可协议，以便让他们知道，他们可以从别的渠道免费得到这份软件，以及你收费的理由。
-> #### 可自由修改
-> 如果你想添加或删除某个功能，没问题，如果你想在别的项目中使用部分代码，也没问题，唯一的要求是，使用了这段代码的项目也必须使用 GPL 协议。
+> 该软件及其相关文档对所有人免费，可以任意处置，包括使用，复制，修改，合并，发表，分发，再授权，或者销售。唯一的限制是，软件中必须包含上述版 权和许可提示。
 >
-> 需要注意的是，分发的时候，需要明确提供源代码和二进制文件，另外，用于某些程序的某些协议有一些问题和限制，你可以看一下 @PierreJoye 写的 Practical Guide to GPL Compliance 一文。使用 GPL 协议，你必须在源代码代码中包含相应信息，以及协议本身。
+> 这意味着：
+> - 你可以自由使用，复制，修改，可以用于自己的项目。
+> - 可以免费分发或用来盈利。
+> - 唯一的限制是必须包含许可声明。
+>
+> MIT 协议是所有开源许可中最宽松的一个，除了必须包含许可声明外，再无任何限制。
 >
 > *以上文字来自 [五种开源协议GPL,LGPL,BSD,MIT,Apache](https://www.oschina.net/question/54100_9455) 。*
-</details>
+</details> 

easysql-api/pom.xml

@@ -1,18 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.2.4</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-api</artifactId>
     <packaging>jar</packaging>
 
-    <name>00-EasySQL-API</name>
+    <name>EasySQL-API</name>
     <description>EasySQL的接口部分。用于打包到公共项目的API中，避免项目过大。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -30,34 +37,23 @@
 
     <licenses>
         <license>
-            <name>GNU General Public License v3.0</name>
-            <url>https://opensource.org/licenses/GPL-3.0</url>
+            <name>The MIT License</name>
+            <url>https://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-    </properties>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -70,6 +66,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

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

@@ -1,30 +1,32 @@
 package cc.carm.lib.easysql.api;
 
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.SQLFunction;
+import cc.carm.lib.easysql.api.function.SQLHandler;
+import cc.carm.lib.easysql.api.function.defaults.DefaultSQLExceptionHandler;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
+import java.util.logging.Logger;
 
 /**
  * SQLAction 是用于承载SQL语句并进行处理、返回的基本类。
  *
  * <ul>
- *     <li>同步执行 {@link #execute()}, {@link #execute(Function, BiConsumer)}
+ *     <li>同步执行 {@link #execute()}, {@link #execute(SQLFunction, SQLExceptionHandler)}
  *     <br>同步执行方法中有会抛出异常的方法与不抛出异常的方法，
  *     <br>若选择不抛出异常，则返回值可能为空，需要特殊处理。</li>
  *
- *     <li>异步执行 {@link #executeAsync(Consumer, BiConsumer)}
+ *     <li>异步执行 {@link #executeAsync(SQLHandler, SQLExceptionHandler)}
  *     <br>异步执行时将提供成功与异常两种处理方式
  *     <br>可自行选择是否对数据或异常进行处理
- *     <br>默认的异常处理器为 {@link #defaultExceptionHandler()}</li>
+ *     <br>默认的异常处理器为 {@link #defaultExceptionHandler()}
+ *     <br>若有特殊需要，可通过{@link #setExceptionHandler(SQLExceptionHandler)} 方法修改默认的处理器</li>
  * </ul>
  *
- * <b>注意： 无论是否异步，都不需要自行关闭ResultSet，本API已自动关闭</b>
- *
  * @param <T> 需要返回的类型
  * @author CarmJos
  * @since 0.0.1
@@ -74,6 +76,18 @@ public interface SQLAction<T> {
 	 */
 	@NotNull T execute() throws SQLException;
 
+
+	/**
+	 * 执行语句并返回值
+	 *
+	 * @param exceptionHandler 异常处理器 默认为 {@link #defaultExceptionHandler()}
+	 * @return 指定类型数据
+	 */
+	@Nullable
+	default T execute(@Nullable SQLExceptionHandler exceptionHandler) {
+		return execute(t -> t, exceptionHandler);
+	}
+
 	/**
 	 * 执行语句并处理返回值
 	 *
@@ -83,28 +97,65 @@ public interface SQLAction<T> {
 	 * @return 指定类型数据
 	 */
 	@Nullable
-	default <R> R execute(@NotNull Function<T, R> function, @Nullable BiConsumer<SQLException, SQLAction<T>> exceptionHandler) {
-		T value = execute(exceptionHandler);
-		if (value == null) return null;
-		else return function.apply(value);
+	default <R> R execute(@NotNull SQLFunction<T, R> function,
+	                      @Nullable SQLExceptionHandler exceptionHandler) {
+		return execute(function, null, exceptionHandler);
 	}
 
 	/**
-	 * 执行语句并返回值
+	 * 执行语句并处理返回值
 	 *
+	 * @param function         处理方法
+	 * @param defaultResult    默认结果，若处理后的结果为null，则返回该值
 	 * @param exceptionHandler 异常处理器 默认为 {@link #defaultExceptionHandler()}
+	 * @param <R>              需要返回的内容
 	 * @return 指定类型数据
 	 */
 	@Nullable
-	default T execute(@Nullable BiConsumer<SQLException, SQLAction<T>> exceptionHandler) {
-		if (exceptionHandler == null) exceptionHandler = defaultExceptionHandler();
-		T value = null;
+	@Contract("_,!null,_ -> !null")
+	default <R> R execute(@NotNull SQLFunction<T, R> function,
+	                      @Nullable R defaultResult,
+	                      @Nullable SQLExceptionHandler exceptionHandler) {
 		try {
-			value = execute();
+			return executeFunction(function, defaultResult);
 		} catch (SQLException exception) {
-			exceptionHandler.accept(exception, this);
+			handleException(exceptionHandler, exception);
+			return null;
+		}
+	}
+
+	/**
+	 * 执行语句并处理返回值
+	 *
+	 * @param function 处理方法
+	 * @param <R>      需要返回的内容
+	 * @return 指定类型数据
+	 * @throws SQLException 当SQL操作出现问题时抛出
+	 */
+	@Nullable
+	default <R> R executeFunction(@NotNull SQLFunction<@NotNull T, R> function) throws SQLException {
+		return executeFunction(function, null);
+	}
+
+	/**
+	 * 执行语句并处理返回值
+	 *
+	 * @param function      处理方法
+	 * @param defaultResult 默认结果，若处理后的结果为null，则返回该值
+	 * @param <R>           需要返回的内容
+	 * @return 指定类型数据
+	 * @throws SQLException 当SQL操作出现问题时抛出
+	 */
+	@Nullable
+	@Contract("_,!null -> !null")
+	default <R> R executeFunction(@NotNull SQLFunction<@NotNull T, R> function,
+	                              @Nullable R defaultResult) throws SQLException {
+		try {
+			R result = function.apply(execute());
+			return result == null ? defaultResult : result;
+		} catch (SQLException exception) {
+			throw new SQLException(exception);
 		}
-		return value;
 	}
 
 	/**
@@ -119,7 +170,7 @@ public interface SQLAction<T> {
 	 *
 	 * @param success 成功时的操作
 	 */
-	default void executeAsync(@Nullable Consumer<T> success) {
+	default void executeAsync(@Nullable SQLHandler<T> success) {
 		executeAsync(success, null);
 	}
 
@@ -129,18 +180,33 @@ public interface SQLAction<T> {
 	 * @param success 成功时的操作
 	 * @param failure 异常处理器 默认为 {@link SQLAction#defaultExceptionHandler()}
 	 */
-	void executeAsync(@Nullable Consumer<T> success, @Nullable BiConsumer<SQLException, SQLAction<T>> failure);
+	void executeAsync(@Nullable SQLHandler<T> success,
+	                  @Nullable SQLExceptionHandler failure);
 
-	/**
-	 * @return 默认的异常处理器
-	 */
-	default BiConsumer<SQLException, SQLAction<T>> defaultExceptionHandler() {
-		return (exception, action) -> {
-			getManager().getLogger().severe("Error when execute [" + action.getSQLContent() + "]");
-			getManager().getLogger().severe(exception.getLocalizedMessage());
-			exception.printStackTrace();
-		};
+	default void handleException(@Nullable SQLExceptionHandler handler, SQLException exception) {
+		if (handler == null) handler = defaultExceptionHandler();
+		handler.accept(exception, this);
 	}
 
+	/**
+	 * 默认的异常处理器
+	 *
+	 * @return {@link DefaultSQLExceptionHandler#get(Logger)}
+	 * @see DefaultSQLExceptionHandler
+	 */
+	default SQLExceptionHandler defaultExceptionHandler() {
+		return DefaultSQLExceptionHandler.get(getManager().getLogger());
+	}
+
+	/**
+	 * 设定通用的异常处理器。
+	 * <br> 在使用 {@link #execute(SQLExceptionHandler)} 等相关方法时，若传入的处理器为null，则会采用此处理器。
+	 * <br> 若该方法传入参数为 null，则会使用 {@link #defaultExceptionHandler()} 。
+	 *
+	 * @param handler 异常处理器
+	 */
+	default void setExceptionHandler(@Nullable SQLExceptionHandler handler) {
+		DefaultSQLExceptionHandler.setCustomHandler(handler);
+	}
 
 }

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

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

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

@@ -4,7 +4,6 @@ import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
 import cc.carm.lib.easysql.api.action.SQLUpdateAction;
 import cc.carm.lib.easysql.api.action.SQLUpdateBatchAction;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
 import cc.carm.lib.easysql.api.builder.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -15,6 +14,7 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 public interface SQLManager {
@@ -23,7 +23,11 @@ public interface SQLManager {
 
 	boolean isDebugMode();
 
-	void setDebugMode(boolean enable);
+	void setDebugMode(@NotNull Supplier<@NotNull Boolean> debugMode);
+
+	default void setDebugMode(boolean enable) {
+		setDebugMode(() -> enable);
+	}
 
 	/**
 	 * 得到连接池源
@@ -49,6 +53,7 @@ public interface SQLManager {
 
 	/**
 	 * 执行一条不需要返回结果的SQL语句(多用于UPDATE、REPLACE、DELETE方法)
+	 * 该方法使用 Statement 实现，请注意SQL注入风险！
 	 *
 	 * @param sql SQL语句内容
 	 * @return 更新的行数
@@ -79,6 +84,7 @@ public interface SQLManager {
 
 	/**
 	 * 执行多条不需要返回结果的SQL。
+	 * 该方法使用 Statement 实现，请注意SQL注入风险！
 	 *
 	 * @param sql     SQL语句内容
 	 * @param moreSQL 更多SQL语句内容
@@ -103,6 +109,14 @@ public interface SQLManager {
 	 */
 	TableCreateBuilder createTable(@NotNull String tableName);
 
+	/**
+	 * 对库中的某个表执行更改
+	 *
+	 * @param tableName 表名
+	 * @return {@link TableAlterBuilder}
+	 */
+	TableAlterBuilder alterTable(@NotNull String tableName);
+
 	/**
 	 * 新建一个查询
 	 *

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

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

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

@@ -4,20 +4,20 @@ import org.jetbrains.annotations.Nullable;
 
 public interface PreparedSQLUpdateAction extends SQLUpdateAction {
 
-	/**
-	 * 设定SQL语句中所有 ? 对应的参数
-	 *
-	 * @param params 参数内容
-	 * @return {@link PreparedSQLUpdateAction}
-	 */
-	PreparedSQLUpdateAction setParams(Object... params);
+    /**
+     * 设定SQL语句中所有 ? 对应的参数
+     *
+     * @param params 参数内容
+     * @return {@link PreparedSQLUpdateAction}
+     */
+    PreparedSQLUpdateAction setParams(Object... params);
 
-	/**
-	 * 设定SQL语句中所有 ? 对应的参数
-	 *
-	 * @param params 参数内容
-	 * @return {@link PreparedSQLUpdateAction}
-	 */
-	PreparedSQLUpdateAction setParams(@Nullable Iterable<Object> params);
+    /**
+     * 设定SQL语句中所有 ? 对应的参数
+     *
+     * @param params 参数内容
+     * @return {@link PreparedSQLUpdateAction}
+     */
+    PreparedSQLUpdateAction setParams(@Nullable Iterable<Object> params);
 
 }

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

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

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

@@ -2,10 +2,6 @@ package cc.carm.lib.easysql.api.action;
 
 import cc.carm.lib.easysql.api.SQLAction;
 
-import java.sql.SQLException;
-import java.util.List;
-import java.util.function.BiConsumer;
-
 public interface SQLUpdateAction extends SQLAction<Integer> {
 
 	/**
@@ -15,18 +11,27 @@ public interface SQLUpdateAction extends SQLAction<Integer> {
 	 *                       <br>若该值 ＞ 0，则 {@link #execute()} 返回自增主键数值
 	 *                       <br>若该值 ≤ 0，则 {@link #execute()} 返回变更的行数
 	 * @return {@link SQLUpdateAction}
+	 * @see #setReturnGeneratedKey(boolean)
 	 */
-	SQLUpdateAction setKeyIndex(int keyColumnIndex);
-
-	/**
-	 * 默认主键序列的数值为 -1 (≤0) ，即默认返回发生变更的行数。
-	 *
-	 * @return 默认主键序列
-	 */
-	default SQLUpdateAction defaultKeyIndex() {
-		return setKeyIndex(-1); // will return changed lines number
+	@Deprecated
+	default SQLUpdateAction setKeyIndex(int keyColumnIndex) {
+		return setReturnGeneratedKey(keyColumnIndex > 0);
 	}
 
+	/**
+	 * 设定该操作返回自增键序列。
+	 *
+	 * @return {@link SQLUpdateAction}
+	 */
+	default SQLUpdateAction returnGeneratedKey() {
+		return setReturnGeneratedKey(true);
+	}
 
+	/**
+	 * 设定该操作是否返回自增键序列。
+	 *
+	 * @return {@link SQLUpdateAction}
+	 */
+	SQLUpdateAction setReturnGeneratedKey(boolean returnGeneratedKey);
 
 }

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

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

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

@@ -7,29 +7,29 @@ import java.util.function.Consumer;
 
 public interface PreparedQueryAction extends QueryAction {
 
-	/**
-	 * 设定SQL语句中所有 ? 对应的参数
-	 *
-	 * @param params 参数内容
-	 * @return {@link PreparedQueryAction}
-	 */
-	PreparedQueryAction setParams(@Nullable Object... params);
+    /**
+     * 设定SQL语句中所有 ? 对应的参数
+     *
+     * @param params 参数内容
+     * @return {@link PreparedQueryAction}
+     */
+    PreparedQueryAction setParams(@Nullable Object... params);
 
-	/**
-	 * 设定SQL语句中所有 ? 对应的参数
-	 *
-	 * @param params 参数内容
-	 * @return {@link PreparedQueryAction}
-	 */
-	PreparedQueryAction setParams(@Nullable Iterable<Object> params);
+    /**
+     * 设定SQL语句中所有 ? 对应的参数
+     *
+     * @param params 参数内容
+     * @return {@link PreparedQueryAction}
+     */
+    PreparedQueryAction setParams(@Nullable Iterable<Object> params);
 
-	/**
-	 * 直接对 {@link PreparedStatement} 进行处理
-	 *
-	 * @param statement {@link Consumer} 处理操作
-	 *                  若为空则不进行处理
-	 * @return {@link PreparedQueryAction}
-	 */
-	PreparedQueryAction handleStatement(@Nullable Consumer<PreparedStatement> statement);
+    /**
+     * 直接对 {@link PreparedStatement} 进行处理
+     *
+     * @param statement {@link Consumer} 处理操作
+     *                  若为空则不进行处理
+     * @return {@link PreparedQueryAction}
+     */
+    PreparedQueryAction handleStatement(@Nullable Consumer<PreparedStatement> statement);
 
 }

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

@@ -1,7 +1,47 @@
 package cc.carm.lib.easysql.api.action.query;
 
 import cc.carm.lib.easysql.api.SQLAction;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.SQLFunction;
+import cc.carm.lib.easysql.api.function.SQLHandler;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.sql.SQLException;
+
+/**
+ * SQLQueryAction 是用于承载SQL查询语句并进行处理、返回并自动关闭连接的基本类。
+ *
+ * <ul>
+ *     <li>同步执行 {@link #execute()}, {@link #execute(SQLFunction, SQLExceptionHandler)}
+ *     <br>同步执行方法中有会抛出异常的方法与不抛出异常的方法，
+ *     <br>若选择不抛出异常，则返回值可能为空，需要特殊处理。</li>
+ *
+ *     <li>异步执行 {@link #executeAsync(SQLHandler, SQLExceptionHandler)}
+ *     <br>异步执行时将提供成功与异常两种处理方式
+ *     <br>可自行选择是否对数据或异常进行处理
+ *     <br>默认的异常处理器为 {@link #defaultExceptionHandler()}</li>
+ * </ul>
+ *
+ * <b>注意： 无论是否异步，都不需要自行关闭ResultSet，本API已自动关闭</b>
+ *
+ * @author CarmJos
+ * @since 0.2.6
+ */
 public interface QueryAction extends SQLAction<SQLQuery> {
 
+	@Override
+	@Contract("_,!null -> !null")
+	default <R> @Nullable R executeFunction(@NotNull SQLFunction<@NotNull SQLQuery, R> function,
+	                                        @Nullable R defaultResult) throws SQLException {
+		try (SQLQuery value = execute()) {
+			R result = function.apply(value);
+			return result == null ? defaultResult : result;
+		} catch (SQLException exception) {
+			throw new SQLException(exception);
+		}
+	}
+
 }

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

@@ -1,5 +1,6 @@
 package cc.carm.lib.easysql.api.builder;
 
+import cc.carm.lib.easysql.api.SQLAction;
 import cc.carm.lib.easysql.api.SQLBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -7,36 +8,47 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Date;
 import java.util.LinkedHashMap;
 
-public interface ConditionalBuilder<T> extends SQLBuilder {
+public interface ConditionalBuilder<B extends ConditionalBuilder<B, T>, T extends SQLAction<?>> extends SQLBuilder {
 
+	/**
+	 * 将现有条件构建完整的SQL语句用于执行。
+	 *
+	 * @return {@link cc.carm.lib.easysql.api.SQLAction}
+	 */
 	T build();
 
-	ConditionalBuilder<T> setLimit(int limit);
+	/**
+	 * 设定取出的条数
+	 *
+	 * @param limit 条数限制
+	 * @return {@link B}
+	 */
+	B setLimit(int limit);
 
-	ConditionalBuilder<T> setConditions(@Nullable String condition);
+	B setConditions(@Nullable String condition);
 
-	ConditionalBuilder<T> setConditions(LinkedHashMap<@NotNull String, @Nullable Object> conditionSQLs);
+	B setConditions(LinkedHashMap<@NotNull String, @Nullable Object> conditionSQLs);
 
-	ConditionalBuilder<T> addCondition(@Nullable String condition);
+	B addCondition(@Nullable String condition);
 
-	ConditionalBuilder<T> addCondition(@NotNull String queryName, @NotNull String operator, @Nullable Object queryValue);
+	B addCondition(@NotNull String queryName, @NotNull String operator, @Nullable Object queryValue);
 
-	default ConditionalBuilder<T> addCondition(@NotNull String queryName, @Nullable Object queryValue) {
+	default B addCondition(@NotNull String queryName, @Nullable Object queryValue) {
 		return addCondition(queryName, "=", queryValue);
 	}
 
-	ConditionalBuilder<T> addCondition(@NotNull String[] queryNames, @Nullable Object[] queryValues);
+	B addCondition(@NotNull String[] queryNames, @Nullable Object[] queryValues);
 
-	ConditionalBuilder<T> addNotNullCondition(@NotNull String queryName);
+	B addNotNullCondition(@NotNull String queryName);
 
-	default ConditionalBuilder<T> addTimeCondition(@NotNull String queryName, long startMillis, long endMillis) {
+	default B addTimeCondition(@NotNull String queryName, long startMillis, long endMillis) {
 		return addTimeCondition(queryName,
 				startMillis > 0 ? new Date(startMillis) : null,
 				endMillis > 0 ? new Date(endMillis) : null
 		);
 	}
 
-	ConditionalBuilder<T> addTimeCondition(@NotNull String queryName, @Nullable java.util.Date startDate, @Nullable java.util.Date endDate);
+	B addTimeCondition(@NotNull String queryName, @Nullable java.util.Date startDate, @Nullable java.util.Date endDate);
 
 
 }

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

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

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

@@ -1,17 +1,19 @@
 package cc.carm.lib.easysql.api.builder;
 
+import cc.carm.lib.easysql.api.SQLAction;
+
 import java.util.Arrays;
 import java.util.List;
 
-public interface InsertBuilder<T> {
+public interface InsertBuilder<T extends SQLAction<?>> {
 
-	String getTableName();
+    String getTableName();
 
-	T setColumnNames(List<String> columnNames);
+    T setColumnNames(List<String> columnNames);
 
-	default T setColumnNames(String... columnNames) {
-		return setColumnNames(columnNames == null ? null : Arrays.asList(columnNames));
-	}
+    default T setColumnNames(String... columnNames) {
+        return setColumnNames(columnNames == null ? null : Arrays.asList(columnNames));
+    }
 
 
 }

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

@@ -7,30 +7,31 @@ import org.jetbrains.annotations.NotNull;
 
 public interface QueryBuilder extends SQLBuilder {
 
-	/**
-	 * 通过一条 SQL语句创建查询
-	 *
-	 * @param sql SQL语句
-	 * @return {@link QueryAction}
-	 * @deprecated 存在SQL注入风险，请使用 {@link QueryBuilder#withPreparedSQL(String)}
-	 */
-	@Deprecated
-	QueryAction withSQL(@NotNull String sql);
+    /**
+     * 通过一条 SQL语句创建查询。
+     * 该方法使用 Statement 实现，请注意SQL注入风险！
+     *
+     * @param sql SQL语句
+     * @return {@link QueryAction}
+     * @deprecated 存在SQL注入风险，建议使用 {@link QueryBuilder#withPreparedSQL(String)}
+     */
+    @Deprecated
+    QueryAction withSQL(@NotNull String sql);
 
-	/**
-	 * 通过一条 SQL语句创建预查询
-	 *
-	 * @param sql SQL语句
-	 * @return {@link PreparedQueryAction}
-	 */
-	PreparedQueryAction withPreparedSQL(@NotNull String sql);
+    /**
+     * 通过一条 SQL语句创建预查询
+     *
+     * @param sql SQL语句
+     * @return {@link PreparedQueryAction}
+     */
+    PreparedQueryAction withPreparedSQL(@NotNull String sql);
 
-	/**
-	 * 创建表查询
-	 *
-	 * @param tableName 表名
-	 * @return {@link TableQueryBuilder}
-	 */
-	TableQueryBuilder inTable(@NotNull String tableName);
+    /**
+     * 创建表查询
+     *
+     * @param tableName 表名
+     * @return {@link TableQueryBuilder}
+     */
+    TableQueryBuilder inTable(@NotNull String tableName);
 
 }

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

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

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

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

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

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

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

@@ -3,19 +3,35 @@ package cc.carm.lib.easysql.api.builder;
 import cc.carm.lib.easysql.api.action.query.PreparedQueryAction;
 import org.jetbrains.annotations.NotNull;
 
-public interface TableQueryBuilder extends ConditionalBuilder<PreparedQueryAction> {
+public interface TableQueryBuilder extends ConditionalBuilder<TableQueryBuilder, PreparedQueryAction> {
 
-	@NotNull String getTableName();
+    @NotNull String getTableName();
 
-	TableQueryBuilder selectColumns(@NotNull String... columnNames);
+    /**
+     * 选定用于查询的列名
+     *
+     * @param columnNames 列名
+     * @return {@link TableQueryBuilder}
+     */
+    TableQueryBuilder selectColumns(@NotNull String... columnNames);
 
-	/**
-	 * 对结果进行排序
-	 *
-	 * @param columnName 排序使用的列名
-	 * @param asc        是否为正序排序 (为false则倒序排序)
-	 * @return {@link TableQueryBuilder}
-	 */
-	TableQueryBuilder orderBy(@NotNull String columnName, boolean asc);
+    /**
+     * 对结果进行排序
+     *
+     * @param columnName 排序使用的列名
+     * @param asc        是否为正序排序 (为false则倒序排序)
+     * @return {@link TableQueryBuilder}
+     */
+    TableQueryBuilder orderBy(@NotNull String columnName, boolean asc);
+
+    /**
+     * 限制查询条数，用于分页查询。
+     *
+     * @param start 开始数
+     * @param end   结束条数
+     * @return {@link TableQueryBuilder}
+     * @since 0.2.6
+     */
+    TableQueryBuilder setPageLimit(int start, int end);
 
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+package cc.carm.lib.easysql.api.function;
+
+import cc.carm.lib.easysql.api.SQLAction;
+
+import java.sql.SQLException;
+import java.util.function.BiConsumer;
+
+@FunctionalInterface
+public interface SQLExceptionHandler extends BiConsumer<SQLException, SQLAction<?>> {
+	
+
+}

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

@@ -0,0 +1,14 @@
+package cc.carm.lib.easysql.api.function;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.SQLException;
+
+@FunctionalInterface
+public interface SQLFunction<T, R> {
+
+	@Nullable
+	R apply(@NotNull T t) throws SQLException;
+
+}

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

@@ -0,0 +1,23 @@
+package cc.carm.lib.easysql.api.function;
+
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.sql.SQLException;
+import java.util.Objects;
+
+@FunctionalInterface
+public interface SQLHandler<T> {
+
+	void accept(@NotNull T t) throws SQLException;
+
+	@NotNull
+	@Contract(pure = true)
+	default SQLHandler<T> andThen(@NotNull SQLHandler<? super T> after) {
+		Objects.requireNonNull(after);
+		return (T t) -> {
+			accept(t);
+			after.accept(t);
+		};
+	}
+}

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

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

easysql-api/src/main/java/cc/carm/lib/easysql/api/util/TimeDateUtils.java

@@ -6,103 +6,103 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class TimeDateUtils {
-	public static DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public static DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-	public TimeDateUtils() {
-	}
+    public TimeDateUtils() {
+    }
 
-	/**
-	 * 得到当前时间文本。
-	 *
-	 * @return 时间文本 格式{@link TimeDateUtils#getFormat()}
-	 */
-	public static String getCurrentTime() {
-		return getTimeString(System.currentTimeMillis());
-	}
+    /**
+     * 得到当前时间文本。
+     *
+     * @return 时间文本 格式{@link TimeDateUtils#getFormat()}
+     */
+    public static String getCurrentTime() {
+        return getTimeString(System.currentTimeMillis());
+    }
 
-	/**
-	 * 得到一个时间戳的文本
-	 *
-	 * @param timeMillis 时间戳
-	 * @return 时间文本 格式{@link TimeDateUtils#getFormat()}
-	 */
-	public static String getTimeString(long timeMillis) {
-		return getFormat().format(new Date(timeMillis));
-	}
+    /**
+     * 得到一个时间戳的文本
+     *
+     * @param timeMillis 时间戳
+     * @return 时间文本 格式{@link TimeDateUtils#getFormat()}
+     */
+    public static String getTimeString(long timeMillis) {
+        return getFormat().format(new Date(timeMillis));
+    }
 
-	/**
-	 * 得到一个日期时间的文本
-	 *
-	 * @param time 日期时间
-	 * @return 时间文本 格式{@link TimeDateUtils#getFormat()}
-	 */
-	public static String getTimeString(Date time) {
-		return getFormat().format(time);
-	}
+    /**
+     * 得到一个日期时间的文本
+     *
+     * @param time 日期时间
+     * @return 时间文本 格式{@link TimeDateUtils#getFormat()}
+     */
+    public static String getTimeString(Date time) {
+        return getFormat().format(time);
+    }
 
-	/**
-	 * 得到一个时间文本的时间戳
-	 *
-	 * @param timeString 时间文本
-	 * @return 时间戳 格式{@link TimeDateUtils#getFormat()}
-	 */
-	public static long parseTimeMillis(String timeString) {
-		if (timeString == null) {
-			return -1L;
-		} else {
-			try {
-				return format.parse(timeString).getTime();
-			} catch (ParseException var2) {
-				return -1L;
-			}
-		}
-	}
+    /**
+     * 得到一个时间文本的时间戳
+     *
+     * @param timeString 时间文本
+     * @return 时间戳 格式{@link TimeDateUtils#getFormat()}
+     */
+    public static long parseTimeMillis(String timeString) {
+        if (timeString == null) {
+            return -1L;
+        } else {
+            try {
+                return format.parse(timeString).getTime();
+            } catch (ParseException var2) {
+                return -1L;
+            }
+        }
+    }
 
 
-	/**
-	 * 得到一个时间文本的对应日期实例
-	 *
-	 * @param timeString 时间文本
-	 * @return 日期实例 格式{@link TimeDateUtils#getFormat()}
-	 */
-	public static Date getTimeDate(String timeString) {
-		if (timeString == null) {
-			return null;
-		} else {
-			try {
-				return format.parse(timeString);
-			} catch (ParseException var2) {
-				return null;
-			}
-		}
-	}
+    /**
+     * 得到一个时间文本的对应日期实例
+     *
+     * @param timeString 时间文本
+     * @return 日期实例 格式{@link TimeDateUtils#getFormat()}
+     */
+    public static Date getTimeDate(String timeString) {
+        if (timeString == null) {
+            return null;
+        } else {
+            try {
+                return format.parse(timeString);
+            } catch (ParseException var2) {
+                return null;
+            }
+        }
+    }
 
-	/**
-	 * 将秒数转化为 DD:hh:mm:ss 格式
-	 *
-	 * @param allSeconds 秒数
-	 * @return DD:hh:mm:ss格式文本
-	 */
-	public static String toDHMSStyle(long allSeconds) {
-		long days = allSeconds / 86400L;
-		long hours = allSeconds % 86400L / 3600L;
-		long minutes = allSeconds % 3600L / 60L;
-		long seconds = allSeconds % 60L;
-		String DateTimes;
-		if (days > 0L) {
-			DateTimes = days + "天" + (hours > 0L ? hours + "小时" : "") + (minutes > 0L ? minutes + "分钟" : "") + (seconds > 0L ? seconds + "秒" : "");
-		} else if (hours > 0L) {
-			DateTimes = hours + "小时" + (minutes > 0L ? minutes + "分钟" : "") + (seconds > 0L ? seconds + "秒" : "");
-		} else if (minutes > 0L) {
-			DateTimes = minutes + "分钟" + (seconds > 0L ? seconds + "秒" : "");
-		} else {
-			DateTimes = seconds + "秒";
-		}
+    /**
+     * 将秒数转化为 DD:hh:mm:ss 格式
+     *
+     * @param allSeconds 秒数
+     * @return DD:hh:mm:ss格式文本
+     */
+    public static String toDHMSStyle(long allSeconds) {
+        long days = allSeconds / 86400L;
+        long hours = allSeconds % 86400L / 3600L;
+        long minutes = allSeconds % 3600L / 60L;
+        long seconds = allSeconds % 60L;
+        String DateTimes;
+        if (days > 0L) {
+            DateTimes = days + "天" + (hours > 0L ? hours + "小时" : "") + (minutes > 0L ? minutes + "分钟" : "") + (seconds > 0L ? seconds + "秒" : "");
+        } else if (hours > 0L) {
+            DateTimes = hours + "小时" + (minutes > 0L ? minutes + "分钟" : "") + (seconds > 0L ? seconds + "秒" : "");
+        } else if (minutes > 0L) {
+            DateTimes = minutes + "分钟" + (seconds > 0L ? seconds + "秒" : "");
+        } else {
+            DateTimes = seconds + "秒";
+        }
 
-		return DateTimes;
-	}
+        return DateTimes;
+    }
 
-	public static DateFormat getFormat() {
-		return format;
-	}
+    public static DateFormat getFormat() {
+        return format;
+    }
 }

easysql-api/src/main/java/cc/carm/lib/easysql/api/util/UUIDUtil.java

@@ -4,12 +4,12 @@ import java.util.UUID;
 
 public class UUIDUtil {
 
-	public static UUID toUUID(String s) {
-		if (s.length() == 36) {
-			return UUID.fromString(s);
-		} else {
-			return UUID.fromString(s.substring(0, 8) + '-' + s.substring(8, 12) + '-' + s.substring(12, 16) + '-' + s.substring(16, 20) + '-' + s.substring(20));
-		}
-	}
+    public static UUID toUUID(String s) {
+        if (s.length() == 36) {
+            return UUID.fromString(s);
+        } else {
+            return UUID.fromString(s.substring(0, 8) + '-' + s.substring(8, 12) + '-' + s.substring(12, 16) + '-' + s.substring(16, 20) + '-' + s.substring(20));
+        }
+    }
 
 }

easysql-beecp/src/main/java/cc/carm/lib/easysql/EasySQL.java

@@ -1,46 +0,0 @@
-package cc.carm.lib.easysql;
-
-import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
-import cc.carm.lib.easysql.api.util.TimeDateUtils;
-import cc.carm.lib.easysql.manager.SQLManagerImpl;
-import cn.beecp.BeeDataSource;
-import cn.beecp.BeeDataSourceConfig;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class EasySQL {
-
-	public static SQLManagerImpl createManager(
-			@NotNull String driver, @NotNull String url,
-			@NotNull String username, @Nullable String password) {
-		return createManager(new BeeDataSourceConfig(driver, url, username, password));
-	}
-
-	public static SQLManagerImpl createManager(@NotNull BeeDataSourceConfig config) {
-		return new SQLManagerImpl(new BeeDataSource(config));
-	}
-
-
-	public static void shutdownManager(SQLManager manager, boolean forceClose, boolean outputActiveQuery) {
-		if (!manager.getActiveQuery().isEmpty()) {
-			manager.getLogger().severe("There are " + manager.getActiveQuery().size() + " connections still running");
-			for (SQLQuery value : manager.getActiveQuery().values()) {
-				if (outputActiveQuery) {
-					manager.getLogger().severe("#" + value.getAction().getShortID() + " -> " + value.getSQLContent());
-					manager.getLogger().severe("- execute at " + TimeDateUtils.getTimeString(value.getExecuteTime()));
-				}
-				if (forceClose) value.close();
-			}
-		}
-		if (manager.getDataSource() instanceof BeeDataSource) {
-			//Close bee connection pool
-			((BeeDataSource) manager.getDataSource()).close();
-		}
-	}
-
-	public static void shutdownManager(SQLManager manager) {
-		shutdownManager(manager, true, manager.isDebugMode());
-	}
-
-}

easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java

@@ -1,56 +0,0 @@
-package cc.carm.lib.easysql;
-
-import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
-import cc.carm.lib.easysql.api.util.TimeDateUtils;
-import cc.carm.lib.easysql.manager.SQLManagerImpl;
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Properties;
-
-public class EasySQL {
-
-	public static SQLManagerImpl createManager(
-			@NotNull String driver, @NotNull String url,
-			@NotNull String username, @Nullable String password) {
-		HikariConfig config = new HikariConfig();
-		config.setDriverClassName(driver);
-		config.setJdbcUrl(url);
-		config.setUsername(username);
-		config.setPassword(password);
-		return createManager(config);
-	}
-
-	public static SQLManagerImpl createManager(@NotNull Properties properties) {
-		return createManager(new HikariConfig(properties));
-	}
-
-	public static SQLManagerImpl createManager(@NotNull HikariConfig config) {
-		return new SQLManagerImpl(new HikariDataSource(config));
-	}
-
-	public static void shutdownManager(SQLManager manager, boolean forceClose, boolean outputActiveQuery) {
-		if (!manager.getActiveQuery().isEmpty()) {
-			manager.getLogger().severe("There are " + manager.getActiveQuery().size() + " connections still running");
-			for (SQLQuery value : manager.getActiveQuery().values()) {
-				if (outputActiveQuery) {
-					manager.getLogger().severe("#" + value.getAction().getShortID() + " -> " + value.getSQLContent());
-					manager.getLogger().severe("- execute at " + TimeDateUtils.getTimeString(value.getExecuteTime()));
-				}
-				if (forceClose) value.close();
-			}
-		}
-		if (manager.getDataSource() instanceof HikariDataSource) {
-			//Close hikari pool
-			((HikariDataSource) manager.getDataSource()).close();
-		}
-	}
-
-	public static void shutdownManager(SQLManager manager) {
-		shutdownManager(manager, true, manager.isDebugMode());
-	}
-
-}

easysql-impl/pom.xml

@@ -1,18 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.4</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-impl</artifactId>
     <packaging>jar</packaging>
 
-    <name>01-EasySQL-Impl</name>
+    <name>EasySQL-Impl</name>
     <description>EasySQL的实现部分。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -30,29 +37,21 @@
 
     <licenses>
         <license>
-            <name>GNU General Public License v3.0</name>
-            <url>https://opensource.org/licenses/GPL-3.0</url>
+            <name>The MIT License</name>
+            <url>https://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
     <dependencies>
 
         <dependency>
@@ -78,6 +77,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

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

@@ -1,14 +1,13 @@
 package cc.carm.lib.easysql.action;
 
 import cc.carm.lib.easysql.api.SQLAction;
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 public abstract class AbstractSQLAction<T> implements SQLAction<T> {
 
@@ -19,8 +18,6 @@ public abstract class AbstractSQLAction<T> implements SQLAction<T> {
 
 	protected @NotNull String sqlContent;
 
-	protected @Nullable BiConsumer<SQLException, SQLAction<T>> exceptionHandler = null;
-
 	public AbstractSQLAction(@NotNull SQLManagerImpl manager, @NotNull String sql) {
 		this(manager, sql, System.currentTimeMillis());
 	}
@@ -68,28 +65,20 @@ public abstract class AbstractSQLAction<T> implements SQLAction<T> {
 	}
 
 	protected void outputDebugMessage() {
-		getManager().debug("#" + getShortID() + " ->" + getSQLContent());
-	}
-
-	public void handleException(SQLException exception) {
-		if (this.exceptionHandler == null) {
-			defaultExceptionHandler().accept(exception, this);
-		} else {
-			this.exceptionHandler.accept(exception, this);
-		}
+		getManager().debug("# " + getShortID() + " -> { " + getSQLContent() + " }");
 	}
 
 	@Override
-	public void executeAsync(Consumer<T> success, BiConsumer<SQLException, SQLAction<T>> failure) {
+	@SuppressWarnings("FutureReturnValueIgnored")
+	public void executeAsync(SQLHandler<T> success, SQLExceptionHandler failure) {
 		getManager().getExecutorPool().submit(() -> {
 			try {
 				T returnedValue = execute();
 				if (success != null) success.accept(returnedValue);
 			} catch (SQLException e) {
-				(failure == null ? defaultExceptionHandler() : failure).accept(e, this);
+				handleException(failure, e);
 			}
 		});
 	}
 
-
 }

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

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

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

@@ -13,7 +13,9 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PreparedSQLUpdateActionImpl extends SQLUpdateActionImpl implements PreparedSQLUpdateAction {
+public class PreparedSQLUpdateActionImpl
+		extends SQLUpdateActionImpl
+		implements PreparedSQLUpdateAction {
 
 	Object[] params;
 
@@ -22,18 +24,18 @@ public class PreparedSQLUpdateActionImpl extends SQLUpdateActionImpl implements
 	}
 
 	public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
-									   @Nullable List<Object> params) {
+	                                   @Nullable List<Object> params) {
 		this(manager, sql, params == null ? null : params.toArray());
 	}
 
 	public PreparedSQLUpdateActionImpl(@NotNull SQLManagerImpl manager, @NotNull String sql,
-									   @Nullable Object[] params) {
+	                                   @Nullable Object[] params) {
 		super(manager, sql);
 		this.params = params;
 	}
 
 	@Override
-	public PreparedSQLUpdateActionImpl setParams(Object[] params) {
+	public PreparedSQLUpdateActionImpl setParams(Object... params) {
 		this.params = params;
 		return this;
 	}
@@ -51,28 +53,25 @@ public class PreparedSQLUpdateActionImpl extends SQLUpdateActionImpl implements
 
 	@Override
 	public @NotNull Integer execute() throws SQLException {
-		int value = -1;
+		try (Connection connection = getManager().getConnection()) {
+
+			try (PreparedStatement statement = StatementUtil.createPrepareStatement(
+					connection, getSQLContent(), params, returnGeneratedKeys
+			)) {
+
+				outputDebugMessage();
+
+				int changes = statement.executeUpdate();
+				if (!returnGeneratedKeys) return changes;
+				else {
+					try (ResultSet resultSet = statement.getGeneratedKeys()) {
+						return resultSet.next() ? resultSet.getInt(1) : -1;
+					}
+				}
 
-		Connection connection = getManager().getConnection();
-		PreparedStatement statement = StatementUtil.createPrepareStatement(
-				connection, getSQLContent(), params, keyIndex > 0
-		);
-		outputDebugMessage();
-		if (keyIndex > 0) {
-			statement.executeUpdate();
-			ResultSet resultSet = statement.getGeneratedKeys();
-			if (resultSet != null) {
-				if (resultSet.next()) value = resultSet.getInt(keyIndex);
-				resultSet.close();
 			}
-		} else {
-			value = statement.executeUpdate();
 		}
 
-		statement.close();
-		connection.close();
-
-		return value;
 	}
 
 }

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

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

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

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

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

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

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

@@ -1,19 +1,17 @@
 package cc.carm.lib.easysql.action.query;
 
 import cc.carm.lib.easysql.action.AbstractSQLAction;
-import cc.carm.lib.easysql.api.SQLAction;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.action.query.QueryAction;
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
+import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import cc.carm.lib.easysql.query.SQLQueryImpl;
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 public class QueryActionImpl extends AbstractSQLAction<SQLQuery> implements QueryAction {
 
@@ -23,25 +21,43 @@ public class QueryActionImpl extends AbstractSQLAction<SQLQuery> implements Quer
 
 	@Override
 	public @NotNull SQLQueryImpl execute() throws SQLException {
+
 		Connection connection = getManager().getConnection();
-		Statement statement = connection.createStatement();
+		Statement statement;
 
+		try {
+			statement = connection.createStatement();
+		} catch (SQLException ex) {
+			connection.close();
+			throw ex;
+		}
+		
 		outputDebugMessage();
+		try {
+			long executeTime = System.currentTimeMillis();
+			SQLQueryImpl query = new SQLQueryImpl(
+					getManager(), this,
+					connection, statement,
+					statement.executeQuery(getSQLContent()),
+					executeTime
+			);
+			getManager().getActiveQuery().put(getActionUUID(), query);
 
-		ResultSet resultSet = statement.executeQuery(getSQLContent());
-		SQLQueryImpl query = new SQLQueryImpl(getManager(), this, connection, statement, resultSet);
-		getManager().getActiveQuery().put(getActionUUID(), query);
-
-		return query;
+			return query;
+		} catch (SQLException exception) {
+			statement.close();
+			connection.close();
+			throw exception;
+		}
 	}
 
 
 	@Override
-	public void executeAsync(Consumer<SQLQuery> success, BiConsumer<SQLException, SQLAction<SQLQuery>> failure) {
+	public void executeAsync(SQLHandler<SQLQuery> success, SQLExceptionHandler failure) {
 		try (SQLQueryImpl query = execute()) {
 			if (success != null) success.accept(query);
 		} catch (SQLException exception) {
-			(exceptionHandler == null ? defaultExceptionHandler() : exceptionHandler).accept(exception, this);
+			handleException(failure, exception);
 		}
 	}
 }

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

@@ -6,14 +6,14 @@ import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractSQLBuilder implements SQLBuilder {
 
-	@NotNull SQLManagerImpl sqlManager;
+    @NotNull SQLManagerImpl sqlManager;
 
-	public AbstractSQLBuilder(@NotNull SQLManagerImpl manager) {
-		this.sqlManager = manager;
-	}
+    public AbstractSQLBuilder(@NotNull SQLManagerImpl manager) {
+        this.sqlManager = manager;
+    }
 
-	@Override
-	public @NotNull SQLManagerImpl getManager() {
-		return this.sqlManager;
-	}
+    @Override
+    public @NotNull SQLManagerImpl getManager() {
+        return this.sqlManager;
+    }
 }

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

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

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

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

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

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

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

@@ -11,24 +11,24 @@ import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import org.jetbrains.annotations.NotNull;
 
 public class QueryBuilderImpl extends AbstractSQLBuilder implements QueryBuilder {
-	public QueryBuilderImpl(@NotNull SQLManagerImpl manager) {
-		super(manager);
-	}
+    public QueryBuilderImpl(@NotNull SQLManagerImpl manager) {
+        super(manager);
+    }
 
-	@Override
-	@Deprecated
-	public QueryAction withSQL(@NotNull String sql) {
-		return new QueryActionImpl(getManager(), sql);
-	}
+    @Override
+    @Deprecated
+    public QueryAction withSQL(@NotNull String sql) {
+        return new QueryActionImpl(getManager(), sql);
+    }
 
-	@Override
-	public PreparedQueryAction withPreparedSQL(@NotNull String sql) {
-		return new PreparedQueryActionImpl(getManager(), sql);
-	}
+    @Override
+    public PreparedQueryAction withPreparedSQL(@NotNull String sql) {
+        return new PreparedQueryActionImpl(getManager(), sql);
+    }
 
-	@Override
-	public TableQueryBuilder inTable(@NotNull String tableName) {
-		return new TableQueryBuilderImpl(getManager(), tableName);
-	}
+    @Override
+    public TableQueryBuilder inTable(@NotNull String tableName) {
+        return new TableQueryBuilderImpl(getManager(), tableName);
+    }
 
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -5,10 +5,10 @@ import cc.carm.lib.easysql.action.PreparedSQLUpdateActionImpl;
 import cc.carm.lib.easysql.action.SQLUpdateActionImpl;
 import cc.carm.lib.easysql.action.SQLUpdateBatchActionImpl;
 import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
 import cc.carm.lib.easysql.api.action.SQLUpdateBatchAction;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
 import cc.carm.lib.easysql.api.builder.*;
 import cc.carm.lib.easysql.builder.impl.*;
 import org.jetbrains.annotations.NotNull;
@@ -21,17 +21,17 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 public class SQLManagerImpl implements SQLManager {
 
 	private final Logger LOGGER;
 	private final DataSource dataSource;
+	protected ExecutorService executorPool;
 	ConcurrentHashMap<UUID, SQLQuery> activeQuery = new ConcurrentHashMap<>();
 
-	boolean debug = false;
-
-	protected ExecutorService executorPool;
+	@NotNull Supplier<Boolean> debugMode = () -> false;
 
 	public SQLManagerImpl(@NotNull DataSource dataSource) {
 		this(dataSource, null);
@@ -50,18 +50,19 @@ public class SQLManagerImpl implements SQLManager {
 
 	@Override
 	public boolean isDebugMode() {
-		return this.debug;
+		return this.debugMode.get();
 	}
 
 	@Override
-	public void setDebugMode(boolean enable) {
-		this.debug = enable;
+	public void setDebugMode(@NotNull Supplier<@NotNull Boolean> debugMode) {
+		this.debugMode = debugMode;
 	}
 
 	public void debug(String msg) {
 		if (isDebugMode()) getLogger().info("[DEBUG] " + msg);
 	}
 
+	@Override
 	public Logger getLogger() {
 		return LOGGER;
 	}
@@ -103,7 +104,7 @@ public class SQLManagerImpl implements SQLManager {
 	}
 
 	@Override
-	public List<Integer> executeSQLBatch(@NotNull String sql, String[] moreSQL) {
+	public List<Integer> executeSQLBatch(@NotNull String sql, String... moreSQL) {
 		SQLUpdateBatchAction action = new SQLUpdateBatchActionImpl(this, sql);
 		if (moreSQL != null && moreSQL.length > 0) {
 			Arrays.stream(moreSQL).forEach(action::addBatch);
@@ -129,6 +130,11 @@ public class SQLManagerImpl implements SQLManager {
 		return new TableCreateBuilderImpl(this, tableName);
 	}
 
+	@Override
+	public TableAlterBuilder alterTable(@NotNull String tableName) {
+		return new TableAlterBuilderImpl(this, tableName);
+	}
+
 	@Override
 	public QueryBuilder createQuery() {
 		return new QueryBuilderImpl(this);

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

@@ -1,7 +1,7 @@
 package cc.carm.lib.easysql.query;
 
 import cc.carm.lib.easysql.action.query.QueryActionImpl;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 
 import java.sql.Connection;
@@ -25,7 +25,15 @@ public class SQLQueryImpl implements SQLQuery {
 			SQLManagerImpl sqlManager, QueryActionImpl queryAction,
 			Connection connection, Statement statement, ResultSet resultSet
 	) {
-		this.executeTime = System.currentTimeMillis();
+		this(sqlManager, queryAction, connection, statement, resultSet, System.currentTimeMillis());
+	}
+
+	public SQLQueryImpl(
+			SQLManagerImpl sqlManager, QueryActionImpl queryAction,
+			Connection connection, Statement statement, ResultSet resultSet,
+			long executeTime
+	) {
+		this.executeTime = executeTime;
 		this.sqlManager = sqlManager;
 		this.queryAction = queryAction;
 		this.connection = connection;
@@ -70,7 +78,7 @@ public class SQLQueryImpl implements SQLQuery {
 			);
 			getManager().getActiveQuery().remove(getAction().getActionUUID());
 		} catch (SQLException e) {
-			getAction().handleException(e);
+			getAction().handleException(getAction().defaultExceptionHandler(), e);
 		}
 		this.queryAction = null;
 	}

easysql-impl/src/main/java/cc/carm/lib/easysql/util/StatementUtil.java

@@ -128,16 +128,12 @@ public class StatementUtil {
 	 * @return 数据类型，默认为 {@link Types#VARCHAR}
 	 */
 	public static int getNullType(PreparedStatement statement, int paramIndex) {
-		int sqlType = Types.VARCHAR;
-
-		final ParameterMetaData pmd;
 		try {
-			pmd = statement.getParameterMetaData();
-			sqlType = pmd.getParameterType(paramIndex);
+			ParameterMetaData pmd = statement.getParameterMetaData();
+			return pmd.getParameterType(paramIndex);
 		} catch (SQLException ignore) {
+			return Types.VARCHAR;
 		}
-
-		return sqlType;
 	}
 
 	/**
@@ -164,13 +160,19 @@ public class StatementUtil {
 			preparedStatement.setNull(paramIndex, type);
 		}
 
-		// 针对UUID特殊处理，避免元数据直接插入
+		// 针对UUID特殊处理，避免元数据直接传入
 		if (param instanceof UUID) {
 			preparedStatement.setString(paramIndex, param.toString());
 			return;
 		}
 
-		// 日期特殊处理，默认按照时间戳传入，避免毫秒丢失
+		// 针对StringBuilder或StringBuffer进行处理，避免元数据传入
+		if (param instanceof StringBuilder || param instanceof StringBuffer) {
+			preparedStatement.setString(paramIndex, param.toString());
+			return;
+		}
+
+		// 日期特殊处理，默认按照时间戳传入，避免精度丢失
 		if (param instanceof java.util.Date) {
 			if (param instanceof Date) {
 				preparedStatement.setDate(paramIndex, (Date) param);
@@ -188,16 +190,14 @@ public class StatementUtil {
 				// BigDecimal的转换交给JDBC驱动处理
 				preparedStatement.setBigDecimal(paramIndex, (BigDecimal) param);
 				return;
-			}
-			if (param instanceof BigInteger) {
-				// BigInteger转为BigDecimal
+			} else if (param instanceof BigInteger) {
 				preparedStatement.setBigDecimal(paramIndex, new BigDecimal((BigInteger) param));
 				return;
 			}
-			// 忽略其它数字类型，按照默认类型传入
+			// 其它数字类型按照默认类型传入
 		}
 
-		// 其它参数类型直接插入
+		// 其它参数类型直接传入
 		preparedStatement.setObject(paramIndex, param);
 	}
 

example/easysql-demo/pom.xml

@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.4</version>
+        <version>0.3.5</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
 
     <artifactId>easysql-demo</artifactId>
     <packaging>jar</packaging>
 
-    <name>99-EasySQL-Demo</name>
+    <name>EasySQL-Demo</name>
     <description>EasySQL的演示部分</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -30,8 +40,8 @@
 
     <licenses>
         <license>
-            <name>GNU General Public License v3.0</name>
-            <url>https://opensource.org/licenses/GPL-3.0</url>
+            <name>The MIT License</name>
+            <url>https://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
 
@@ -45,15 +55,6 @@
         <url>${project.url}/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-    </properties>
-
     <dependencies>
 
         <dependency>

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

@@ -1,27 +1,56 @@
 import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.api.enums.ForeignKeyRule;
+import cc.carm.lib.easysql.api.enums.IndexType;
+import cc.carm.lib.easysql.api.enums.NumberType;
 import cc.carm.lib.easysql.api.util.TimeDateUtils;
 import cc.carm.lib.easysql.api.util.UUIDUtil;
+import org.jetbrains.annotations.TestOnly;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.UUID;
 
+@TestOnly
+@SuppressWarnings("all")
 public class EasySQLDemo {
 
 	public void createTable(SQLManager sqlManager) {
 		// 同步创建表
 		sqlManager.createTable("users")
-				.addColumn("id", "INT(11) AUTO_INCREMENT NOT NULL PRIMARY KEY")
+//				.addColumn("id", "INT(11) AUTO_INCREMENT NOT NULL PRIMARY KEY")
+				.addAutoIncrementColumn("id", NumberType.INT, true, true)
 				.addColumn("uuid", "VARCHAR(32) NOT NULL UNIQUE KEY")
-				.addColumn("username", "VARCHAR(16) NOT NULL UNIQUE KEY")
-				.addColumn("age", "INT(3) NOT NULL DEFAULT 1")
+				.addColumn("username", "VARCHAR(16) NOT NULL")
+				.addColumn("age", "TINYINT NOT NULL DEFAULT 1")
 				.addColumn("email", "VARCHAR(32)")
 				.addColumn("phone", "VARCHAR(16)")
 				.addColumn("registerTime", "DATETIME NOT NULL")
+//				.addColumn("INDEX `phone`") // 原始方法添加索引
+				.setIndex("username", IndexType.UNIQUE_KEY) // 添加唯一索引
+				.setIndex(IndexType.INDEX, "contact", "email", "phone") //添加联合索引 (示例)
+				.build().execute(null /* 不处理错误 */);
+
+		sqlManager.createTable("user_ipaddr")
+				.addAutoIncrementColumn("id", NumberType.INT, true, true)
+				.addColumn("uuid", "VARCHAR(32) NOT NULL")
+				.addColumn("ip", "VARCHAR(16)")
+				.addColumn("time", "DATETIME NOT NULL")
+				.addForeignKey("uuid", null,
+						"users", "uuid",
+						ForeignKeyRule.CASCADE, ForeignKeyRule.CASCADE
+				)
 				.build().execute(null /* 不处理错误 */);
 	}
 
+	public void alertTable(SQLManager sqlManager) {
+		// 同步更新表
+		sqlManager.alterTable("users")
+				.modifyColumn("age", "TINYINT NOT NULL DEFAULT 0")
+				.execute(null /* 不处理错误 */);
+	}
+
+
 	public void sqlQuery(SQLManager sqlManager) {
 		// 同步SQL查询
 		try (SQLQuery query = sqlManager.createQuery()
@@ -49,16 +78,11 @@ public class EasySQLDemo {
 				.build().execute(query -> {
 					//可以直接进行数据处理
 					ResultSet result = query.getResultSet();
-					try {
-						if (result != null && result.next()) {
-							return UUIDUtil.toUUID(result.getString("uuid"));
-						}
-					} catch (SQLException ignored) {
-					}
-					return null;
+					return result.next() ? UUIDUtil.toUUID(result.getString("uuid")) : null;
 				}, (exception, action) -> {
 					// 处理异常，不想处理直接填null
 				});
+
 	}
 
 	public void sqlQueryAsync(SQLManager sqlManager) {
@@ -69,12 +93,8 @@ public class EasySQLDemo {
 				.setLimit(1) // 只取出一个数据
 				.build().executeAsync(success -> {
 					ResultSet resultSet = success.getResultSet();
-					try {
-						if (resultSet != null && resultSet.next()) {
-							String username = resultSet.getString("username");
-						}
-					} catch (SQLException e) {
-						e.printStackTrace();
+					if (resultSet != null && resultSet.next()) {
+						String username = resultSet.getString("username");
 					}
 				}, (exception, action) -> {
 					//do something

example/easysql-test/pom.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

pom.xml

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

with-pool/easysql-beecp/pom.xml

@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.4</version>
+        <version>0.3.5</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-beecp</artifactId>
     <packaging>jar</packaging>
 
-    <name>10-EasySQL-BeeCP</name>
+    <name>EasySQL-BeeCP</name>
     <description>EasySQL的应用部分。此为BeeCP版本。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -30,31 +38,30 @@
 
     <licenses>
         <license>
-            <name>GNU General Public License v3.0</name>
-            <url>https://opensource.org/licenses/GPL-3.0</url>
+            <name>The MIT License</name>
+            <url>https://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
     <dependencies>
 
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easysql-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>easysql-impl</artifactId>
@@ -66,7 +73,7 @@
             <!--项目地址 https://github.com/Chris2018998/BeeCP  -->
             <groupId>com.github.chris2018998</groupId>
             <artifactId>beecp</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>
@@ -87,10 +94,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -101,10 +112,6 @@
                 </executions>
                 <configuration>
                     <relocations>
-                        <relocation>
-                            <pattern>org.slf4j</pattern>
-                            <shadedPattern>cc.carm.lib.easysql.slf4j</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>cn.beecp</pattern>
                             <shadedPattern>cc.carm.lib.easysql.beecp</shadedPattern>

with-pool/easysql-beecp/src/main/java/cc/carm/lib/easysql/EasySQL.java

@@ -0,0 +1,46 @@
+package cc.carm.lib.easysql;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.api.util.TimeDateUtils;
+import cc.carm.lib.easysql.manager.SQLManagerImpl;
+import cn.beecp.BeeDataSource;
+import cn.beecp.BeeDataSourceConfig;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class EasySQL {
+
+    public static SQLManagerImpl createManager(
+            @NotNull String driver, @NotNull String url,
+            @NotNull String username, @Nullable String password) {
+        return createManager(new BeeDataSourceConfig(driver, url, username, password));
+    }
+
+    public static SQLManagerImpl createManager(@NotNull BeeDataSourceConfig config) {
+        return new SQLManagerImpl(new BeeDataSource(config));
+    }
+
+
+    public static void shutdownManager(SQLManager manager, boolean forceClose, boolean outputActiveQuery) {
+        if (!manager.getActiveQuery().isEmpty()) {
+            manager.getLogger().severe("There are " + manager.getActiveQuery().size() + " connections still running");
+            for (SQLQuery value : manager.getActiveQuery().values()) {
+                if (outputActiveQuery) {
+                    manager.getLogger().severe("#" + value.getAction().getShortID() + " -> " + value.getSQLContent());
+                    manager.getLogger().severe("- execute at " + TimeDateUtils.getTimeString(value.getExecuteTime()));
+                }
+                if (forceClose) value.close();
+            }
+        }
+        if (manager.getDataSource() instanceof BeeDataSource) {
+            //Close bee connection pool
+            ((BeeDataSource) manager.getDataSource()).close();
+        }
+    }
+
+    public static void shutdownManager(SQLManager manager) {
+        shutdownManager(manager, true, manager.isDebugMode());
+    }
+
+}

with-pool/easysql-hikaricp/pom.xml

@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.4</version>
+        <version>0.3.5</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+
     <artifactId>easysql-hikaricp</artifactId>
 
-    <name>11-EasySQL-HikariCP</name>
+    <name>EasySQL-HikariCP</name>
     <description>EasySQL的应用部分。此为HikariCP版本。</description>
     <url>https://github.com/CarmJos/EasySQL</url>
 
@@ -29,31 +37,30 @@
 
     <licenses>
         <license>
-            <name>GNU General Public License v3.0</name>
-            <url>https://opensource.org/licenses/GPL-3.0</url>
+            <name>The MIT License</name>
+            <url>https://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>${project.url}/issues</url>
+        <url>https://github.com/CarmJos/EasySQL/issues</url>
     </issueManagement>
 
     <ciManagement>
         <system>GitHub Actions</system>
-        <url>${project.url}/actions/workflows/maven.yml</url>
+        <url>https://github.com/CarmJos/EasySQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
     <dependencies>
 
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easysql-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>easysql-impl</artifactId>
@@ -86,10 +93,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -100,10 +111,6 @@
                 </executions>
                 <configuration>
                     <relocations>
-                        <relocation>
-                            <pattern>org.slf4j</pattern>
-                            <shadedPattern>cc.carm.lib.easysql.slf4j</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>com.zaxxer.hikari</pattern>
                             <shadedPattern>cc.carm.lib.easysql.hikari</shadedPattern>

with-pool/easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java

@@ -0,0 +1,56 @@
+package cc.carm.lib.easysql;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.api.util.TimeDateUtils;
+import cc.carm.lib.easysql.manager.SQLManagerImpl;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Properties;
+
+public class EasySQL {
+
+    public static SQLManagerImpl createManager(
+            @NotNull String driver, @NotNull String url,
+            @NotNull String username, @Nullable String password) {
+        HikariConfig config = new HikariConfig();
+        config.setDriverClassName(driver);
+        config.setJdbcUrl(url);
+        config.setUsername(username);
+        config.setPassword(password);
+        return createManager(config);
+    }
+
+    public static SQLManagerImpl createManager(@NotNull Properties properties) {
+        return createManager(new HikariConfig(properties));
+    }
+
+    public static SQLManagerImpl createManager(@NotNull HikariConfig config) {
+        return new SQLManagerImpl(new HikariDataSource(config));
+    }
+
+    public static void shutdownManager(SQLManager manager, boolean forceClose, boolean outputActiveQuery) {
+        if (!manager.getActiveQuery().isEmpty()) {
+            manager.getLogger().severe("There are " + manager.getActiveQuery().size() + " connections still running");
+            for (SQLQuery value : manager.getActiveQuery().values()) {
+                if (outputActiveQuery) {
+                    manager.getLogger().severe("#" + value.getAction().getShortID() + " -> " + value.getSQLContent());
+                    manager.getLogger().severe("- execute at " + TimeDateUtils.getTimeString(value.getExecuteTime()));
+                }
+                if (forceClose) value.close();
+            }
+        }
+        if (manager.getDataSource() instanceof HikariDataSource) {
+            //Close hikari pool
+            ((HikariDataSource) manager.getDataSource()).close();
+        }
+    }
+
+    public static void shutdownManager(SQLManager manager) {
+        shutdownManager(manager, true, manager.isDebugMode());
+    }
+
+}