diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/types/StorageMysql.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/types/StorageMysql.java index 9bcb69f..14e87dc 100644 --- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/types/StorageMysql.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/types/StorageMysql.java @@ -42,7 +42,7 @@ public class StorageMysql extends Storage { public List getRowsByGroup(String group) { List rows = new ArrayList<>(); try { - ResultSet set = database.getConnection().createStatement().executeQuery(String.format("SELECT * FROM `%s`", group)); + ResultSet set = database.getConnection().createStatement().executeQuery(String.format("SELECT * FROM `" + instance.getConfig().getString("Database.Prefix") + "%s`", group)); while (set.next()) { Map items = new HashMap<>(); @@ -64,8 +64,8 @@ public class StorageMysql extends Storage { @Override public void clearFile() { try { - database.getConnection().createStatement().execute("TRUNCATE `sync`"); - database.getConnection().createStatement().execute("TRUNCATE `boosts`"); + database.getConnection().createStatement().execute("TRUNCATE `" + instance.getConfig().getString("Database.Prefix") + "sync`"); + database.getConnection().createStatement().execute("TRUNCATE `" + instance.getConfig().getString("Database.Prefix") + "boosts`"); } catch (SQLException e) { e.printStackTrace(); } @@ -74,7 +74,7 @@ public class StorageMysql extends Storage { @Override public void saveItem(String group, StorageItem... items) { try { - StringBuilder sql = new StringBuilder(String.format("INSERT INTO `%s`", group)); + StringBuilder sql = new StringBuilder(String.format("INSERT INTO `" + instance.getConfig().getString("Database.Prefix") + "%s`", group)); sql.append(" ("); diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java index 232782b..1b0e186 100644 --- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java @@ -22,7 +22,7 @@ public class MySQLDatabase { //ToDo: This is sloppy connection.createStatement().execute( - "CREATE TABLE IF NOT EXISTS `sync` (\n" + + "CREATE TABLE IF NOT EXISTS `" + instance.getConfig().getString("Database.Prefix") + "sync` (\n" + "\t`location` TEXT NULL,\n" + "\t`level` INT NULL,\n" + "\t`block` TEXT NULL,\n" + @@ -36,7 +36,7 @@ public class MySQLDatabase { "\t`black` TEXT NULL\n" + ")"); - connection.createStatement().execute("CREATE TABLE IF NOT EXISTS `boosts` (\n" + + connection.createStatement().execute("CREATE TABLE IF NOT EXISTS `" + instance.getConfig().getString("Database.Prefix") + "boosts` (\n" + "\t`endtime` TEXT NULL,\n" + "\t`amount` INT NULL,\n" + "\t`uuid` TEXT NULL\n" + diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/SettingsManager.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/SettingsManager.java index fc96b9f..ffe5f7e 100644 --- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/SettingsManager.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/SettingsManager.java @@ -216,6 +216,7 @@ public class SettingsManager implements Listener { DATABASE_IP("Database.IP", "127.0.0.1"), DATABASE_PORT("Database.Port", 3306), DATABASE_NAME("Database.Database Name", "EpicHoppers"), + DATABASE_PREFIX("Database.Prefix", "EH-"), DATABASE_USERNAME("Database.Username", "PUT_USERNAME_HERE"), DATABASE_PASSWORD("Database.Password", "PUT_PASSWORD_HERE"),