Merge branch 'dev'

src/main/java/com/redstoner/misc/mysql/MysqlHandler.java

@@ -55,10 +55,10 @@ public class MysqlHandler {
 	}
 
 	public MysqlDatabase getDatabase(String databaseName) {
-		return new MysqlDatabase(this, databaseName);
+		return new MysqlDatabase(getConnection(databaseName));
 	}
 
-	public Connection getConnection(String databaseName) throws IllegalStateException {
+	private Connection getConnection(String databaseName) throws IllegalStateException {
 		Connection connection = null;
 		try {
 			connection = DriverManager.getConnection(url + databaseName, username, password);
@@ -76,7 +76,7 @@ public class MysqlHandler {
 			ResultSet           queryResults = metadata.getCatalogs();
 			while (queryResults.next()) {
 				String databaseName = queryResults.getString("TABLE_CAT");
-				databases.add(new MysqlDatabase(this, databaseName));
+				databases.add(new MysqlDatabase(getConnection(databaseName)));
 			}
 			connection.close();
 			return databases;

src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java

@@ -1,6 +1,5 @@
 package com.redstoner.misc.mysql.elements;
 
-import com.redstoner.misc.mysql.MysqlHandler;
 import com.redstoner.misc.mysql.MysqlQueryHandler;
 
 import java.sql.Connection;
@@ -11,14 +10,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class MysqlDatabase {
-	private Connection connection = null;
+	private Connection connection;
 
-	private final MysqlHandler handler;
+	public MysqlDatabase(Connection connection) {
-	private final String databaseName;
+		this.connection = connection;
-
-	public MysqlDatabase(MysqlHandler handler, String databaseName) {
-		this.handler = handler;
-		this.databaseName = databaseName;
 	}
 
 	public MysqlTable getTable(String name) {
@@ -26,7 +21,7 @@ public class MysqlDatabase {
 	}
 
 	public boolean createTable(String name, MysqlField... description) {
-		return MysqlQueryHandler.queryNoResult(getConnection(), "CREATE TABLE `" + name + "` " + getDescription(description) + ";");
+		return MysqlQueryHandler.queryNoResult(connection, "CREATE TABLE `" + name + "` " + getDescription(description) + ";");
 	}
 
 	private String getDescription(MysqlField... description) {
@@ -52,20 +47,20 @@ public class MysqlDatabase {
 	}
 
 	public boolean createTableIfNotExists(String name, MysqlField... description) {
-		return MysqlQueryHandler.queryNoResult(getConnection(), "CREATE TABLE IF NOT EXISTS `" + name + "` " + getDescription(description) + ";");
+		return MysqlQueryHandler.queryNoResult(connection, "CREATE TABLE IF NOT EXISTS `" + name + "` " + getDescription(description) + ";");
 	}
 
 	public boolean dropTable(String name) {
-		return MysqlQueryHandler.queryNoResult(getConnection(), "DROP TABLE `" + name + "`;");
+		return MysqlQueryHandler.queryNoResult(connection, "DROP TABLE `" + name + "`;");
 	}
 
 	public boolean drop() {
-		return MysqlQueryHandler.queryNoResult(getConnection(), "DROP DATABASE `" + getName() + "`;");
+		return MysqlQueryHandler.queryNoResult(connection, "DROP DATABASE `" + getName() + "`;");
 	}
 
 	public String getName() {
 		try {
-			return getConnection().getCatalog();
+			return connection.getCatalog();
 		} catch (SQLException e) {
 			e.printStackTrace();
 			return null;
@@ -75,7 +70,7 @@ public class MysqlDatabase {
 	public List<MysqlTable> getTables() {
 		try {
 			List<MysqlTable> tables       = new ArrayList<>();
-			DatabaseMetaData metadata     = getConnection().getMetaData();
+			DatabaseMetaData metadata     = connection.getMetaData();
 			ResultSet        queryResults = metadata.getTables(null, null, "%", null);
 
 			while (queryResults.next()) {
@@ -89,16 +84,7 @@ public class MysqlDatabase {
 		}
 	}
 
-	Connection getConnection() {
+	protected Connection getConnection() {
-		try {
-			if (connection == null || connection.isClosed()) {
-				connection = handler.getConnection(databaseName);
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-			connection = handler.getConnection(databaseName);
-		}
-
 		return connection;
 	}
 }