2 files changed, 14 insertions, 11 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
index 0eceb98..0489b5d 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java
@@ -22,6 +22,7 @@ package net.tylermurphy.hideAndSeek.database;
 import com.google.common.io.ByteStreams;
 import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.database.connections.DatabaseConnection;
+import net.tylermurphy.hideAndSeek.database.connections.MySQLConnection;
 import net.tylermurphy.hideAndSeek.database.connections.SQLiteConnection;
 
 import java.io.ByteArrayInputStream;
@@ -32,6 +33,8 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.UUID;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.databaseType;
+
 public class Database {
 
     private final GameDataTable playerInfo;
@@ -40,7 +43,11 @@ public class Database {
 
     public Database(){
 
-        connection = new SQLiteConnection();
+        if(databaseType.equals("SQLITE")) {
+            connection = new SQLiteConnection();
+        } else {
+            connection = new MySQLConnection();
+        }
 
         playerInfo = new GameDataTable(this);
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
index c29d1b3..b7c1b1d 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/database/connections/MySQLConnection.java
@@ -25,26 +25,22 @@ import com.zaxxer.hikari.HikariDataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.*;
+
 public class MySQLConnection implements DatabaseConnection {
 
-    private final HikariConfig config;
     private final HikariDataSource ds;
 
     public MySQLConnection(){
 
-        String host = "to be implemented";
-        String port = "to be implemented";
-        String user = "to be implemented";
-        String pass = "to be implemented";
-
-        config = new HikariConfig();
+        HikariConfig config = new HikariConfig();
 
-        config.setJdbcUrl("jdbc:mariadb://"+host+":"+port+"/kenbot");
+        config.setJdbcUrl("jdbc:mariadb://"+databaseHost+":"+databasePort+"/"+databaseName);
         config.addDataSourceProperty("cachePrepStmts", "true");
         config.addDataSourceProperty("prepStmtCacheSize", "250");
         config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
-        config.addDataSourceProperty("user", user);
-        config.addDataSourceProperty("password",pass);
+        config.addDataSourceProperty("user", databaseUser);
+        config.addDataSourceProperty("password",databasePass);
         config.addDataSourceProperty("autoCommit", "true");
         config.setAutoCommit(true);
         config.setMaximumPoolSize(20);