From c20b677507df7eba33ffb54194a50367b01bd3ad Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 13 Apr 2021 18:24:54 +0200
Subject: [PATCH] Improve table creation logic

---
 src/main/java/de/diddiz/LogBlock/Updater.java      | 14 +++++++++-----
 .../java/de/diddiz/LogBlock/config/Config.java     |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/Updater.java b/src/main/java/de/diddiz/LogBlock/Updater.java
index 67ca04a..36b4b29 100644
--- a/src/main/java/de/diddiz/LogBlock/Updater.java
+++ b/src/main/java/de/diddiz/LogBlock/Updater.java
@@ -842,11 +842,15 @@ class Updater {
     }
 
     private void createTable(DatabaseMetaData dbm, Statement state, String table, String query) throws SQLException {
-        if (!dbm.getTables(null, null, table, null).next()) {
-            logblock.getLogger().log(Level.INFO, "Creating table " + table + ".");
-            state.execute("CREATE TABLE `" + table + "` " + query);
-            if (!dbm.getTables(null, null, table, null).next()) {
-                throw new SQLException("Table " + table + " not found and failed to create");
+        try (ResultSet tableResult = dbm.getTables(Config.mysqlDatabase, null, table, null)) {
+            if (!tableResult.next()) {
+                logblock.getLogger().log(Level.INFO, "Creating table " + table + ".");
+                state.execute("CREATE TABLE `" + table + "` " + query);
+                try (ResultSet tableResultNew = dbm.getTables(Config.mysqlDatabase, null, table, null)) {
+                    if (!tableResultNew.next()) {
+                        throw new SQLException("Table " + table + " not found and failed to create");
+                    }
+                }
             }
         }
     }
diff --git a/src/main/java/de/diddiz/LogBlock/config/Config.java b/src/main/java/de/diddiz/LogBlock/config/Config.java
index 38e9950..a30f422 100644
--- a/src/main/java/de/diddiz/LogBlock/config/Config.java
+++ b/src/main/java/de/diddiz/LogBlock/config/Config.java
@@ -25,6 +25,7 @@ public class Config {
     private static LoggingEnabledMapping superWorldConfig;
     private static Map<String, WorldConfig> worldConfigs;
     public static String url, user, password;
+    public static String mysqlDatabase;
     public static boolean mysqlUseSSL;
     public static boolean mysqlRequireSSL;
     public static int delayBetweenRuns, forceToProcessAtLeast, timePerRun;
@@ -175,7 +176,8 @@ public class Config {
         ComparableVersion configVersion = new ComparableVersion(config.getString("version"));
         boolean oldConfig = configVersion.compareTo(new ComparableVersion(CURRENT_CONFIG_VERSION)) < 0;
 
-        url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + getStringIncludingInts(config, "mysql.database");
+        mysqlDatabase = getStringIncludingInts(config, "mysql.database");
+        url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + mysqlDatabase;
         user = getStringIncludingInts(config, "mysql.user");
         password = getStringIncludingInts(config, "mysql.password");
         mysqlUseSSL = config.getBoolean("mysql.useSSL", true);