[0.3.8] 执行相关优化

- 优化部分调用，替换制表符为空格。 - 补充残缺的 Objects.requireNonNull(); - 对于SQLQuery的auto-close额外判断ResultSet、Statement与Connection是否已关闭，避免重复关闭报错。
2026-06-04 15:28:20 +08:00 · 2022-02-21 20:38:32 +08:00
parent 2de21a4658
commit 68b5d071ae
64 changed files with 2312 additions and 2294 deletions
@@ -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.7</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.36</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.tester.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>
@@ -0,0 +1,36 @@
+package cc.carm.lib.easysql.tester;
+
+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 {
+
+    protected static void print(@NotNull String format, Object... params) {
+        Main.print(format, params);
+    }
+
+    @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;
+        }
+    }
+
+
+}
@@ -0,0 +1,93 @@
+package cc.carm.lib.easysql.tester;
+
+import cc.carm.lib.easysql.EasySQL;
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.tester.tests.DeleteTest;
+import cc.carm.lib.easysql.tester.tests.QueryCloseTest;
+import cc.carm.lib.easysql.tester.tests.QueryFunctionTest;
+import cc.carm.lib.easysql.tester.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);
+    }
+
+}
@@ -0,0 +1,22 @@
+package cc.carm.lib.easysql.tester.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.tester.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);
+
+    }
+}
@@ -0,0 +1,35 @@
+package cc.carm.lib.easysql.tester.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.tester.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.printf(
+                        "id: %d username: %s%n",
+                        resultSet.getInt("id"),
+                        resultSet.getString("username")
+                );
+
+            }
+        }
+
+    }
+}
@@ -0,0 +1,26 @@
+package cc.carm.lib.easysql.tester.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.tester.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);
+
+    }
+}
@@ -0,0 +1,30 @@
+package cc.carm.lib.easysql.tester.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.tester.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.printf("id: %d username: %s%n", resultSet.getInt("id"), resultSet.getString("username"));
+
+        }
+
+
+    }
+}
@@ -0,0 +1,38 @@
+package cc.carm.lib.easysql.tester.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.tester.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 {
+
+
+    protected static List<Object[]> generateParams() {
+        return IntStream.range(0, 5).mapToObj(i -> generateParam()).collect(Collectors.toList());
+    }
+
+    protected static Object[] generateParam() {
+        UUID uuid = UUID.randomUUID();
+        return new Object[]{uuid, uuid.toString().substring(0, 5), (int) (Math.random() * 50)};
+    }
+
+    @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()));
+
+    }
+
+
+}
@@ -0,0 +1,24 @@
+package cc.carm.lib.easysql.tester.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()));
+    }
+
+
+}
@@ -0,0 +1,35 @@
+package cc.carm.lib.easysql.tester.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.enums.NumberType;
+import cc.carm.lib.easysql.tester.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();
+
+    }
+
+}
@@ -0,0 +1,38 @@
+package cc.carm.lib.easysql.tester.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.tester.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();
+
+    }
+
+}
@@ -0,0 +1,16 @@
+package cc.carm.lib.easysql.tester.tests;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.tester.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();
+    }
+}
@@ -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>
+