TotalFreedomMC/TF-Marriage
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-Marriage.git synced 2024-05-19 19:11:21 +00:00
Code Issues Projects Releases Wiki Activity

End url with database name. Fixes #33

Browse source
This commit is contained in:
Lennart ten Wolde 2017-11-23 20:04:02 +01:00
parent 6bb62cab26
commit b4dc7e0713
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/com/lenis0012/bukkit/marriage2/internal/data/DataManager.java
View file

@ -61,14 +61,14 @@ public class DataManager {
} }
private void loadWithDriver(Driver driver, FileConfiguration config) { private void loadWithDriver(Driver driver, FileConfiguration config) {
String url; String url, user = "", password = "";
if(driver == Driver.MYSQL) { if(driver == Driver.MYSQL) {
String user = config.getString("MySQL.user", "root"); user = config.getString("MySQL.user", "root");
String pswd = config.getString("MySQL.password", ""); password = config.getString("MySQL.password", "");
String host = config.getString("MySQL.host", "localhost:3306"); String host = config.getString("MySQL.host", "localhost:3306");
String database = config.getString("MySQL.database", "myserver"); String database = config.getString("MySQL.database", "myserver");
this.prefix = config.getString("MySQL.prefix", "marriage_"); this.prefix = config.getString("MySQL.prefix", "marriage_");
url = String.format("jdbc:mysql://%s/%s?user=%s&password=%s", host, database, user, pswd); url = String.format("jdbc:mysql://%s/%s", host, database);
driver = Driver.MYSQL; driver = Driver.MYSQL;
} else { } else {
url = String.format("jdbc:sqlite:%s", new File(core.getPlugin().getDataFolder(), "database.db").getPath()); url = String.format("jdbc:sqlite:%s", new File(core.getPlugin().getDataFolder(), "database.db").getPath());
@ -99,7 +99,7 @@ public class DataManager {
} }
// Create cached connection supplier. // Create cached connection supplier.
this.supplier = new LockedReference(new ConnectionSupplier(url), 30L, TimeUnit.SECONDS, new ConnectionInvalidator()); this.supplier = new LockedReference(new ConnectionSupplier(url, user, password), 30L, TimeUnit.SECONDS, new ConnectionInvalidator());
DBUpgrade upgrade = new DBUpgrade(); DBUpgrade upgrade = new DBUpgrade();
Connection connection = supplier.access(); Connection connection = supplier.access();
@ -385,14 +385,22 @@ public class DataManager {
public static final class ConnectionSupplier { public static final class ConnectionSupplier {
private final String url; private final String url;
private final String user;
private final String password;
private ConnectionSupplier(String url) { private ConnectionSupplier(String url) {
this(url, "", "");
}
private ConnectionSupplier(String url, String user, String password) {
this.url = url; this.url = url;
this.user = user;
this.password = password;
} }
public Connection get() { public Connection get() {
try { try {
return DriverManager.getConnection(url); return DriverManager.getConnection(url, user, password);
} catch(SQLException e) { } catch(SQLException e) {
return null; return null;
} }