Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-23 07:41:19 +01:00
Code Issues Projects Releases Wiki Activity

[Fix] Patch system apply check

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

Affected issues: #754
This commit is contained in:
Rsl1122 2018-10-22 20:27:12 +03:00
parent ca01c26a19
commit b9027294ef
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLDB.java
View File

@ -457,6 +457,10 @@ public abstract class SQLDB extends Database {
return serverUUIDSupplier;
}
public PlanConfig getConfig() {
return config;
}
public NetworkContainer.Factory getNetworkContainerFactory() {
return networkContainerFactory;
}

4
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java
View File

@ -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

9
Plan/src/main/java/com/djrapitops/plan/system/settings/Settings.java
View File

@ -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();
}
}