PostgreSQL Database Support

lang/en.yml

@@ -125,6 +125,7 @@ MISSING_PARAMETERS: "Please use \"{0}\"."
 MISSING_ROLLBACK_RADIUS: "You did not specify a {rollback|restore} radius."
 MISSING_ROLLBACK_USER: "You did not specify a {rollback|restore} user."
 MYSQL_UNAVAILABLE: "Unable to connect to MySQL server."
+PGSQL_UNAVAILABLE: "Unable to connect to PostgreSQL server."
 NETWORK_CONNECTION: "Connection by {0} {successful|failed}. Using {1} {2}."
 NETWORK_TEST: "Network test data has been successful sent."
 NO_DATA: "No data found at {0}."
@@ -196,6 +197,7 @@ UPGRADE_IN_PROGRESS: "Upgrade in progress. Please try again later."
 USER_NOT_FOUND: "User \"{0}\" not found."
 USER_OFFLINE: "The user \"{0}\" is not online."
 USING_MYSQL: "Using MySQL for data storage."
+USING_PGSQL: "Using PostgreSQL for data storage."
 USING_SQLITE: "Using SQLite for data storage."
 VALID_DONATION_KEY: "Valid donation key."
 VERSION_NOTICE: "Version {0} is now available."

pom.xml

@@ -129,5 +129,10 @@
       <artifactId>HikariCP</artifactId>
       <version>5.0.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.7.1</version>
+    </dependency>
   </dependencies>
 </project>

src/main/java/net/coreprotect/CoreProtect.java

@@ -88,11 +88,19 @@
         if (start) {
             PluginDescriptionFile pluginDescription = this.getDescription();
             Util.sendConsoleComponentStartup(Bukkit.getServer().getConsoleSender(), Phrase.build(Phrase.ENABLE_SUCCESS, ConfigHandler.EDITION_NAME));
-            if (Config.getGlobal().MYSQL) {
-                Chat.console(Phrase.build(Phrase.USING_MYSQL));
-            }
-            else {
-                Chat.console(Phrase.build(Phrase.USING_SQLITE));
+            switch (Config.getGlobal().DB_TYPE) {
+                case MYSQL: {
+                    Chat.console(Phrase.build(Phrase.USING_MYSQL));
+                    break;
+                }
+                case PGSQL: {
+                    Chat.console(Phrase.build(Phrase.USING_PGSQL));
+                    break;
+                }
+                case SQLITE: {
+                    Chat.console(Phrase.build(Phrase.USING_SQLITE));
+                    break;
+                }
             }
 
             Chat.console("--------------------");
@@ -164,62 +172,62 @@
         return true;
     }
 
     private static void safeShutdown(CoreProtect plugin) {
         try {
             /* if server is stopping, log disconnections of online players */
             if (ConfigHandler.serverRunning && PaperAdapter.ADAPTER.isStopping(plugin.getServer())) {
                 for (Player player : plugin.getServer().getOnlinePlayers()) {
                     PlayerQuitListener.queuePlayerQuit(player);
                 }
             }
 
             if (!ConfigHandler.isFolia) {
                 Iterator<Entry<Location, BlockData>> iterator = Teleport.revertBlocks.entrySet().iterator();
                 while (iterator.hasNext()) {
                     Entry<Location, BlockData> entry = iterator.next();
                     entry.getKey().getBlock().setBlockData(entry.getValue());
                     iterator.remove();
                 }
             }
 
             ConfigHandler.serverRunning = false;
             long shutdownTime = System.currentTimeMillis();
             long alertTime = shutdownTime + (10 * 1000);
             if (ConfigHandler.converterRunning) {
                 Chat.console(Phrase.build(Phrase.FINISHING_CONVERSION));
             }
             else {
                 Chat.console(Phrase.build(Phrase.FINISHING_LOGGING));
             }
 
             while ((Consumer.isRunning() || ConfigHandler.converterRunning) && !ConfigHandler.purgeRunning) {
                 long time = System.currentTimeMillis();
                 if (time >= alertTime) {
                     if (!ConfigHandler.converterRunning) {
                         int consumerId = (Consumer.currentConsumer == 1) ? 1 : 0;
                         int consumerCount = Consumer.getConsumerSize(consumerId) + Process.getCurrentConsumerSize();
                         Chat.console(Phrase.build(Phrase.LOGGING_ITEMS, String.format("%,d", consumerCount)));
                     }
                     alertTime = alertTime + (30 * 1000);
                 }
                 else if (!ConfigHandler.databaseReachable && (time - shutdownTime) >= (5 * 60 * 1000)) {
                     Chat.console(Phrase.build(Phrase.DATABASE_UNREACHABLE));
                     break;
                 }
                 else if ((time - shutdownTime) >= (15 * 60 * 1000)) {
                     Chat.console(Phrase.build(Phrase.LOGGING_TIME_LIMIT));
                     break;
                 }
 
                 Thread.sleep(100);
             }
 
             ConfigHandler.performDisable();
             Chat.console(Phrase.build(Phrase.DISABLE_SUCCESS, "CoreProtect v" + plugin.getDescription().getVersion()));
         }
         catch (Exception e) {
             e.printStackTrace();
         }
     }
 
 }

src/main/java/net/coreprotect/api/BlockAPI.java

@@ -1,15 +1,16 @@
 package net.coreprotect.api;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.block.Block;
 
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.Database;
+import net.coreprotect.database.StatementUtils;
 import net.coreprotect.database.statement.UserStatement;
 import net.coreprotect.utility.Util;
 
@@ -37,32 +38,34 @@ public static List<String[]> performLookup(Block block, int offset) {
                 return result;
             }
 
-            Statement statement = connection.createStatement();
-            String query = "SELECT time,user,action,type,data,blockdata,rolled_back FROM " + ConfigHandler.prefix + "block " + Util.getWidIndex("block") + "WHERE wid = '" + worldId + "' AND x = '" + x + "' AND z = '" + z + "' AND y = '" + y + "' AND time > '" + checkTime + "' ORDER BY rowid DESC";
-            ResultSet results = statement.executeQuery(query);
+            try (PreparedStatement ps = connection.prepareStatement("SELECT time, \"user\", action, type, data, blockdata, rolled_back FROM " + StatementUtils.getTableName("block") + " " + Util.getWidIndex("block") + "WHERE wid = ? AND x = ? AND z = ? AND y = ? AND time > ? ORDER BY rowid DESC")) {
+                ps.setInt(1, worldId);
+                ps.setInt(2, x);
+                ps.setInt(3, z);
+                ps.setInt(4, y);
+                ps.setInt(5, checkTime);
+                try (ResultSet rs = ps.executeQuery()) {
+                    while (rs.next()) {
+                        String resultTime = rs.getString("time");
+                        int resultUserId = rs.getInt("user");
+                        String resultAction = rs.getString("action");
+                        int resultType = rs.getInt("type");
+                        String resultData = rs.getString("data");
+                        byte[] resultBlockData = rs.getBytes("blockdata");
+                        String resultRolledBack = rs.getString("rolled_back");
+                        if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
+                            UserStatement.loadName(connection, resultUserId);
+                        }
+                        String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
+                        String blockData = Util.byteDataToString(resultBlockData, resultType);
 
-            while (results.next()) {
-                String resultTime = results.getString("time");
-                int resultUserId = results.getInt("user");
-                String resultAction = results.getString("action");
-                int resultType = results.getInt("type");
-                String resultData = results.getString("data");
-                byte[] resultBlockData = results.getBytes("blockdata");
-                String resultRolledBack = results.getString("rolled_back");
-                if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
-                    UserStatement.loadName(connection, resultUserId);
+                        String[] lookupData = new String[] { resultTime, resultUser, String.valueOf(x), String.valueOf(y), String.valueOf(z), String.valueOf(resultType), resultData, resultAction, resultRolledBack, String.valueOf(worldId), blockData };
+                        String[] lineData = Util.toStringArray(lookupData);
+                        result.add(lineData);
+                    }
                 }
-                String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
-                String blockData = Util.byteDataToString(resultBlockData, resultType);
-
-                String[] lookupData = new String[] { resultTime, resultUser, String.valueOf(x), String.valueOf(y), String.valueOf(z), String.valueOf(resultType), resultData, resultAction, resultRolledBack, String.valueOf(worldId), blockData };
-                String[] lineData = Util.toStringArray(lookupData);
-                result.add(lineData);
             }
-            results.close();
-            statement.close();
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 

src/main/java/net/coreprotect/api/SessionLookup.java

@@ -1,15 +1,16 @@
 package net.coreprotect.api;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.Database;
+import net.coreprotect.database.StatementUtils;
 import net.coreprotect.database.statement.UserStatement;
 
 public class SessionLookup {
@@ -43,27 +44,28 @@ public static List<String[]> performLookup(String user, int offset) {
             }
             int userId = ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT));
 
-            try (Statement statement = connection.createStatement()) {
-                String query = "SELECT time,user,wid,x,y,z,action FROM " + ConfigHandler.prefix + "session WHERE user = '" + userId + "' AND time > '" + checkTime + "' ORDER BY rowid DESC";
-                ResultSet results = statement.executeQuery(query);
-                while (results.next()) {
-                    String resultTime = results.getString("time");
-                    int resultUserId = results.getInt("user");
-                    String resultWorldId = results.getString("wid");
-                    String resultX = results.getString("x");
-                    String resultY = results.getString("y");
-                    String resultZ = results.getString("z");
-                    String resultAction = results.getString("action");
+            try (PreparedStatement statement = connection.prepareStatement("SELECT time, \"user\", wid, x, y, z, action FROM " + StatementUtils.getTableName("session") + " WHERE \"user\" = ? AND time > ? ORDER BY rowid DESC")) {
+                statement.setInt(1, userId);
+                statement.setInt(2, checkTime);
+                try (ResultSet results = statement.executeQuery()) {
+                    while (results.next()) {
+                        String resultTime = results.getString("time");
+                        int resultUserId = results.getInt("user");
+                        String resultWorldId = results.getString("wid");
+                        String resultX = results.getString("x");
+                        String resultY = results.getString("y");
+                        String resultZ = results.getString("z");
+                        String resultAction = results.getString("action");
 
-                    if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
-                        UserStatement.loadName(connection, resultUserId);
-                    }
-                    String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
+                        if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
+                            UserStatement.loadName(connection, resultUserId);
+                        }
+                        String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
 
-                    String[] lookupData = new String[] { resultTime, resultUser, resultX, resultY, resultZ, resultWorldId, type, resultAction };
-                    result.add(lookupData);
+                        String[] lookupData = new String[] { resultTime, resultUser, resultX, resultY, resultZ, resultWorldId, type, resultAction };
+                        result.add(lookupData);
+                    }
                 }
-                results.close();
             }
         }
         catch (Exception e) {