Fix dbPrefix issue when using convert command

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -214,8 +214,11 @@ public class QuickShop extends JavaPlugin implements QuickShopAPI {
     private DatabaseManager databaseManager;
     /**
      * Default database prefix, can overwrite by config
+     * <p>
+     * Deprecated: use manager#getDatabase#getTableprefix instead
      */
     @Getter
+    @Deprecated
     private String dbPrefix = "";
     /**
      * Whether we should use display items or not
@@ -1190,10 +1193,12 @@ private boolean setupDatabase() {
             AbstractDatabaseCore dbCore;
             if (Objects.requireNonNull(dbCfg).getBoolean("mysql")) {
                 // MySQL database - Required database be created first.
-                dbPrefix = dbCfg.getString("prefix");
-                if (dbPrefix == null || "none".equals(dbPrefix)) {
-                    dbPrefix = "";
+                String prefix = dbCfg.getString("prefix");
+                if (prefix == null || "none".equals(prefix)) {
+                    prefix = "";
                 }
+                //just keep backward compatible
+                dbPrefix = prefix;
                 String user = dbCfg.getString("user");
                 String pass = dbCfg.getString("password");
                 String host = dbCfg.getString("host");
@@ -1207,7 +1212,7 @@ private boolean setupDatabase() {
                         optionsMap.put(strings[0], strings[1]);
                     }
                 }
-                dbCore = new MySQLCore(this, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(database, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), useSSL, optionsMap);
+                dbCore = new MySQLCore(this, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(database, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), prefix, useSSL, optionsMap);
             } else {
                 // SQLite database - Doing this handles file creation
                 dbCore = new SQLiteCore(this, new File(this.getDataFolder(), "shops.db"));

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Convert.java

@@ -86,6 +86,7 @@ public void onCommand(@NotNull ConsoleCommandSender sender, @NotNull String comm
             String port = dbCfg.getString("port");
             String databaseStr = dbCfg.getString("database");
             boolean useSSL = dbCfg.getBoolean("usessl");
+            String prefix = dbCfg.getString("prefix", "");
             Map<String, String> optionsMap = new HashMap<>();
             for (String options : dbCfg.getStringList("mysql-connect-options")) {
                 String[] strings = options.split("=", 2);
@@ -96,7 +97,7 @@ public void onCommand(@NotNull ConsoleCommandSender sender, @NotNull String comm
             running = true;
             plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
                 try {
-                    AbstractDatabaseCore dbCore = new MySQLCore(plugin, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(databaseStr, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), useSSL, optionsMap);
+                    AbstractDatabaseCore dbCore = new MySQLCore(plugin, Objects.requireNonNull(host, "MySQL host can't be null"), Objects.requireNonNull(user, "MySQL username can't be null"), Objects.requireNonNull(pass, "MySQL password can't be null"), Objects.requireNonNull(databaseStr, "MySQL database name can't be null"), Objects.requireNonNull(port, "MySQL port can't be null"), prefix, useSSL, optionsMap);
                     DatabaseManager databaseManager = new DatabaseManager(QuickShop.getInstance(), dbCore);
                     sender.sendMessage(ChatColor.GREEN + "Converting...");
                     transferShops(new SimpleDatabaseHelper(plugin, databaseManager), sender);

src/main/java/org/maxgamer/quickshop/database/AbstractDatabaseCore.java

@@ -57,6 +57,10 @@ void signalForNewConnection() {
 
     }
 
+    public String getTablePrefix() {
+        return "";
+    }
+
     /**
      * Close all not in-use connections created by DatabaseCore.
      */

src/main/java/org/maxgamer/quickshop/database/MySQLCore.java

@@ -46,15 +46,20 @@ public class MySQLCore extends AbstractDatabaseCore {
     @NotNull
     private final QuickShop plugin;
 
+
+    private final String tablePrefix;
+
     public MySQLCore(
             @NotNull QuickShop plugin,
             @NotNull String host,
             @NotNull String user,
             @NotNull String pass,
             @NotNull String database,
             @NotNull String port,
+            @NotNull String tablePrefix,
             boolean useSSL, Map<String, String> options) {
         this.plugin = plugin;
+        this.tablePrefix = tablePrefix;
         info = new Properties();
         info.setProperty("autoReconnect", "true");
         info.setProperty("user", user);
@@ -76,6 +81,10 @@ public MySQLCore(
         }
     }
 
+    @Override
+    public String getTablePrefix() {
+        return tablePrefix;
+    }
 
     @Override
     synchronized void close() {