From b9027294efe08478788ce1f2046f8d35a1f4238e Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Mon, 22 Oct 2018 20:27:12 +0300
Subject: [PATCH] [Fix] Patch system apply check

Wrong method was in use for database name setting retrieval, resulting
in wrong query. Fixed by replacing usage with correct method

Affected issues: #754
---
 .../plan/system/database/databases/sql/SQLDB.java        | 4 ++++
 .../system/database/databases/sql/patches/Patch.java     | 4 ++--
 .../com/djrapitops/plan/system/settings/Settings.java    | 9 +++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
index 0b3c776ca..02c114a49 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
@@ -457,6 +457,10 @@ public abstract class SQLDB extends Database {
         return serverUUIDSupplier;
     }
 
+    public PlanConfig getConfig() {
+        return config;
+    }
+
     public NetworkContainer.Factory getNetworkContainerFactory() {
         return networkContainerFactory;
     }
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java
index 716f2055d..921eb3c44 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java
@@ -39,7 +39,7 @@ public abstract class Patch {
             public void prepare(PreparedStatement statement) throws SQLException {
                 statement.setString(1, tableName);
                 if (usingMySQL) {
-                    statement.setString(2, Settings.DB_DATABASE.toString());
+                    statement.setString(2, db.getConfig().getString(Settings.DB_DATABASE));
                 }
             }
 
@@ -58,7 +58,7 @@ public abstract class Patch {
                     public void prepare(PreparedStatement statement) throws SQLException {
                         statement.setString(1, tableName);
                         statement.setString(2, columnName);
-                        statement.setString(3, Settings.DB_DATABASE.toString());
+                        statement.setString(3, db.getConfig().getString(Settings.DB_DATABASE));
                     }
 
                     @Override
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/settings/Settings.java b/Plan/src/main/java/com/djrapitops/plan/system/settings/Settings.java
index 77c1c5683..7a34e66d4 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/settings/Settings.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/settings/Settings.java
@@ -114,4 +114,13 @@ public enum Settings implements Setting {
         return configPath;
     }
 
+    /**
+     * @return What getPath returns
+     * @deprecated Old access method used to return string value in config. Use {@link com.djrapitops.plan.system.settings.config.PlanConfig#getString(Setting)} instead
+     */
+    @Deprecated
+    @Override
+    public String toString() {
+        return getPath();
+    }
 }