From d83425a830473c8bf4258a181771776ad3410961 Mon Sep 17 00:00:00 2001 From: Alexander <38283619+AlexanderMoebius@users.noreply.github.com> Date: Fri, 22 Jul 2022 13:50:36 +0200 Subject: [PATCH 1/3] only scan for tables in the database currently used. Otherwise errors can occur due to not finding a table assumed to be in the database when trying to rename it. --- plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java b/plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java index f5a65a2..4201157 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java +++ b/plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java @@ -107,6 +107,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+"'"; } } From cb5648e7d4ee73f934197652bc12de8c231e9a51 Mon Sep 17 00:00:00 2001 From: Alexander <38283619+AlexanderMoebius@users.noreply.github.com> Date: Fri, 22 Jul 2022 14:01:20 +0200 Subject: [PATCH 2/3] use MySQL driver due to higher availability at users servers than mariadb driver --- plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java b/plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java index 4201157..336b1e6 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java +++ b/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); } From a58df75d580f654ed0d7a68b838ccf410d8fb243 Mon Sep 17 00:00:00 2001 From: Alexander <38283619+AlexanderMoebius@users.noreply.github.com> Date: Fri, 22 Jul 2022 14:36:10 +0200 Subject: [PATCH 3/3] fix shop-taxES in config.yml add small comment in config.yml --- plugin/src/main/resources/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml index 32034ee..add1ca6 100644 --- a/plugin/src/main/resources/config.yml +++ b/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