Merge pull request #6 from GamesMCde/feature/clean-project

- Fix custom taxes in configuration.
- Use MySQL driver and improve database renames

plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java

@@ -23,11 +23,12 @@ public class MySQL extends Database {
         HikariConfig config = new HikariConfig();
         // TODO Inspect this
         //  Why mariadb instead of my sql dani ?
-        config.setJdbcUrl(String.format("jdbc:mariadb://%s:%d/%s",
+        config.setJdbcUrl(String.format("jdbc:mysql://%s:%d/%s",
                 Config.databaseMySqlHost, Config.databaseMySqlPort, Config.databaseMySqlDatabase));
         config.setUsername(Config.databaseMySqlUsername);
         config.setPassword(Config.databaseMySqlPassword);
         config.setConnectionTestQuery("SELECT 1");
+        config.setDriverClassName("com.mysql.cj.jdbc.Driver");
 
         return new HikariDataSource(config);
     }
@@ -107,6 +108,6 @@ public class MySQL extends Database {
 
     @Override
     String getQueryGetTable() {
-        return "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME=?";
+        return "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME=? AND TABLE_SCHEMA='"+Config.databaseMySqlDatabase+"'";
     }
 }

plugin/src/main/resources/config.yml

@@ -147,7 +147,8 @@ shop-creation-price:
   # ...an admin shop
   admin: 0
 
-shop-tax:
+# The shop taxes for items in percent
+shop-taxes:
   default: 0
   enchanted_book: 30