From 8c4479189450af233b216d00b2e55017878950a0 Mon Sep 17 00:00:00 2001
From: CarmJos <KarmunJ@outlook.com>
Date: Sun, 6 Feb 2022 01:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 19 +++--
 .../storage/impl/MySQLStorage.java            |  8 +-
 .../ultradepository/util/DatabaseTable.java   | 77 +++++++++++++++++++
 3 files changed, 94 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/cc/carm/plugin/ultradepository/util/DatabaseTable.java

diff --git a/pom.xml b/pom.xml
index 9195518..1d64f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>11</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>
         <easyplugin.version>1.3.5</easyplugin.version>
@@ -112,7 +113,9 @@
 
         <dependency>
             <groupId>cc.carm.lib</groupId>
-            <artifactId>easyplugin-database</artifactId>
+            <artifactId>easysql-beecp</artifactId>
+            <version>0.3.6</version>
+            <scope>compile</scope>
             <optional>true</optional>
         </dependency>
 
@@ -140,7 +143,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>2.2.1</version>
+            <version>3.0.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -213,8 +216,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</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>
@@ -267,6 +270,10 @@
                             <pattern>cc.carm.lib.easyplugin</pattern>
                             <shadedPattern>cc.carm.plugin.ultradepository.lib.easyplugin</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>cc.carm.lib.easysql</pattern>
+                            <shadedPattern>cc.carm.plugin.ultradepository.lib.easysql</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>cc.carm.lib.githubreleases4j</pattern>
                             <shadedPattern>cc.carm.plugin.ultradepository.lib.github</shadedPattern>
diff --git a/src/main/java/cc/carm/plugin/ultradepository/storage/impl/MySQLStorage.java b/src/main/java/cc/carm/plugin/ultradepository/storage/impl/MySQLStorage.java
index 768da19..6730f00 100644
--- a/src/main/java/cc/carm/plugin/ultradepository/storage/impl/MySQLStorage.java
+++ b/src/main/java/cc/carm/plugin/ultradepository/storage/impl/MySQLStorage.java
@@ -1,12 +1,12 @@
 package cc.carm.plugin.ultradepository.storage.impl;
 
 import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
-import cc.carm.lib.easyplugin.database.DatabaseTable;
-import cc.carm.lib.easyplugin.database.EasySQL;
-import cc.carm.lib.easyplugin.database.api.SQLManager;
-import cc.carm.lib.easyplugin.database.api.action.query.PreparedQueryAction;
+import cc.carm.lib.easysql.EasySQL;
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.action.query.PreparedQueryAction;
 import cc.carm.plugin.ultradepository.UltraDepository;
 import cc.carm.plugin.ultradepository.data.UserData;
+import cc.carm.plugin.ultradepository.util.DatabaseTable;
 import cc.carm.plugin.ultradepository.util.DateIntUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/cc/carm/plugin/ultradepository/util/DatabaseTable.java b/src/main/java/cc/carm/plugin/ultradepository/util/DatabaseTable.java
new file mode 100644
index 0000000..933b395
--- /dev/null
+++ b/src/main/java/cc/carm/plugin/ultradepository/util/DatabaseTable.java
@@ -0,0 +1,77 @@
+package cc.carm.plugin.ultradepository.util;
+
+import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
+import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
+import cc.carm.lib.easysql.api.builder.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.SQLException;
+
+public class DatabaseTable {
+
+	private final @NotNull String tableName;
+	private final @NotNull String[] columns;
+
+	@Nullable String tableSettings;
+
+	public DatabaseTable(@NotNull String tableName, @NotNull String[] columns) {
+		this(tableName, columns, null);
+	}
+
+	public DatabaseTable(@NotNull String tableName, @NotNull String[] columns,
+						 @Nullable String tableSettings) {
+		this.tableName = tableName;
+		this.columns = columns;
+		this.tableSettings = tableSettings;
+	}
+
+	public @NotNull String getTableName() {
+		return tableName;
+	}
+
+	public @NotNull String[] getColumns() {
+		return columns;
+	}
+
+	public @Nullable String getTableSettings() {
+		return tableSettings;
+	}
+
+	public int createTable(SQLManager sqlManager) throws SQLException {
+		TableCreateBuilder createAction = sqlManager.createTable(getTableName());
+		createAction.setColumns(getColumns());
+		if (getTableSettings() != null) createAction.setTableSettings(getTableSettings());
+		return createAction.build().execute();
+	}
+
+	public TableQueryBuilder createQuery(SQLManager sqlManager) {
+		return sqlManager.createQuery().inTable(getTableName());
+	}
+
+	public DeleteBuilder createDelete(SQLManager sqlManager) {
+		return sqlManager.createDelete(getTableName());
+	}
+
+	public UpdateBuilder createUpdate(SQLManager sqlManager) {
+		return sqlManager.createUpdate(getTableName());
+	}
+
+	public InsertBuilder<PreparedSQLUpdateAction> createInsert(SQLManager sqlManager) {
+		return sqlManager.createInsert(getTableName());
+	}
+
+	public InsertBuilder<PreparedSQLUpdateBatchAction> createInsertBatch(SQLManager sqlManager) {
+		return sqlManager.createInsertBatch(getTableName());
+	}
+
+	public ReplaceBuilder<PreparedSQLUpdateAction> createReplace(SQLManager sqlManager) {
+		return sqlManager.createReplace(getTableName());
+	}
+
+	public ReplaceBuilder<PreparedSQLUpdateBatchAction> createReplaceBatch(SQLManager sqlManager) {
+		return sqlManager.createReplaceBatch(getTableName());
+	}
+
+}