Fixed SQLFeatureNotSupportedException when logging entity data (fixes #455)

src/main/java/net/coreprotect/database/Database.java

@@ -106,6 +106,10 @@ public class Database extends Queue {
         }
     }
 
+    public static boolean hasReturningKeys() {
+        return (!Config.getGlobal().MYSQL && ConfigHandler.SERVER_VERSION >= 20);
+    }
+
     public static void containerBreakCheck(String user, Material type, Object container, ItemStack[] contents, Location location) {
         if (BlockGroup.CONTAINERS.contains(type) && !BlockGroup.SHULKER_BOXES.contains(type)) {
             if (Config.getConfig(location.getWorld()).ITEM_TRANSACTIONS) {
@@ -286,8 +290,13 @@ public class Database extends Queue {
         PreparedStatement preparedStatement = null;
         try {
             if (keys) {
+                if (hasReturningKeys()) {
+                    preparedStatement = connection.prepareStatement(query + " RETURNING rowid");
+                }
+                else {
                     preparedStatement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
                 }
+            }
             else {
                 preparedStatement = connection.prepareStatement(query);
             }

src/main/java/net/coreprotect/database/logger/EntityKillLogger.java

@@ -10,6 +10,7 @@ import org.bukkit.block.BlockState;
 import net.coreprotect.CoreProtect;
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
+import net.coreprotect.database.Database;
 import net.coreprotect.database.statement.BlockStatement;
 import net.coreprotect.database.statement.EntityStatement;
 import net.coreprotect.database.statement.UserStatement;
@@ -43,11 +44,21 @@ public class EntityKillLogger {
             int x = block.getX();
             int y = block.getY();
             int z = block.getZ();
-            EntityStatement.insert(preparedStmt2, time, data);
+            int entity_key = 0;
+
+            ResultSet resultSet = EntityStatement.insert(preparedStmt2, time, data);
+            if (Database.hasReturningKeys()) {
+                resultSet.next();
+                entity_key = resultSet.getInt(1);
+                resultSet.close();
+            }
+            else {
                 ResultSet keys = preparedStmt2.getGeneratedKeys();
                 keys.next();
-            int entity_key = keys.getInt(1);
+                entity_key = keys.getInt(1);
                 keys.close();
+            }
+
             BlockStatement.insert(preparedStmt, batchCount, time, userId, wid, x, y, z, type, entity_key, null, null, 3, 0);
         }
         catch (Exception e) {

src/main/java/net/coreprotect/database/logger/SkullBreakLogger.java

@@ -8,6 +8,7 @@ import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
 
 import net.coreprotect.config.ConfigHandler;
+import net.coreprotect.database.Database;
 import net.coreprotect.database.statement.SkullStatement;
 import net.coreprotect.utility.Util;
 
@@ -29,12 +30,19 @@ public class SkullBreakLogger {
             int skullKey = 0;
             if (skull.hasOwner()) {
                 skullOwner = skull.getOwningPlayer().getUniqueId().toString();
-                SkullStatement.insert(preparedStmt2, time, skullOwner);
+                ResultSet resultSet = SkullStatement.insert(preparedStmt2, time, skullOwner);
+                if (Database.hasReturningKeys()) {
+                    resultSet.next();
+                    skullKey = resultSet.getInt(1);
+                    resultSet.close();
+                }
+                else {
                     ResultSet keys = preparedStmt2.getGeneratedKeys();
                     keys.next();
                     skullKey = keys.getInt(1);
                     keys.close();
                 }
+            }
 
             BlockBreakLogger.log(preparedStmt, batchCount, user, block.getLocation(), type, skullKey, null, block.getBlockData().getAsString(), null);
         }

src/main/java/net/coreprotect/database/logger/SkullPlaceLogger.java

@@ -9,6 +9,7 @@ import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
 
 import net.coreprotect.config.ConfigHandler;
+import net.coreprotect.database.Database;
 import net.coreprotect.database.statement.SkullStatement;
 
 public class SkullPlaceLogger {
@@ -31,13 +32,20 @@ public class SkullPlaceLogger {
                 String skullOwner = "";
                 if (skull.hasOwner()) {
                     skullOwner = skull.getOwningPlayer().getUniqueId().toString();
-                    SkullStatement.insert(preparedStmt2, time, skullOwner);
+                    ResultSet resultSet = SkullStatement.insert(preparedStmt2, time, skullOwner);
+                    if (Database.hasReturningKeys()) {
+                        resultSet.next();
+                        skullKey = resultSet.getInt(1);
+                        resultSet.close();
+                    }
+                    else {
                         ResultSet keys = preparedStmt2.getGeneratedKeys();
                         keys.next();
                         skullKey = keys.getInt(1);
                         keys.close();
                     }
                 }
+            }
 
             BlockPlaceLogger.log(preparedStmt, batchCount, user, block, replaceType, replaceData, type, skullKey, true, null, null, null);
         }

src/main/java/net/coreprotect/database/statement/EntityStatement.java

@@ -12,13 +12,15 @@ import org.bukkit.block.BlockState;
 import org.bukkit.util.io.BukkitObjectInputStream;
 import org.bukkit.util.io.BukkitObjectOutputStream;
 
+import net.coreprotect.database.Database;
+
 public class EntityStatement {
 
     private EntityStatement() {
         throw new IllegalStateException("Database class");
     }
 
-    public static void insert(PreparedStatement preparedStmt, int time, List<Object> data) {
+    public static ResultSet insert(PreparedStatement preparedStmt, int time, List<Object> data) {
         try {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             BukkitObjectOutputStream oos = new BukkitObjectOutputStream(bos);
@@ -30,11 +32,18 @@ public class EntityStatement {
             byte[] byte_data = bos.toByteArray();
             preparedStmt.setInt(1, time);
             preparedStmt.setObject(2, byte_data);
+            if (Database.hasReturningKeys()) {
+                return preparedStmt.executeQuery();
+            }
+            else {
                 preparedStmt.executeUpdate();
             }
+        }
         catch (Exception e) {
             e.printStackTrace();
         }
+
+        return null;
     }
 
     public static List<Object> getData(Statement statement, BlockState block, String query) {

src/main/java/net/coreprotect/database/statement/SkullStatement.java

@@ -9,21 +9,30 @@ import org.bukkit.Bukkit;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
 
+import net.coreprotect.database.Database;
+
 public class SkullStatement {
 
     private SkullStatement() {
         throw new IllegalStateException("Database class");
     }
 
-    public static void insert(PreparedStatement preparedStmt, int time, String owner) {
+    public static ResultSet insert(PreparedStatement preparedStmt, int time, String owner) {
         try {
             preparedStmt.setInt(1, time);
             preparedStmt.setString(2, owner);
+            if (Database.hasReturningKeys()) {
+                return preparedStmt.executeQuery();
+            }
+            else {
                 preparedStmt.executeUpdate();
             }
+        }
         catch (Exception e) {
             e.printStackTrace();
         }
+
+        return null;
     }
 
     public static void getData(Statement statement, BlockState block, String query) {

src/main/java/net/coreprotect/database/statement/UserStatement.java

@@ -9,6 +9,7 @@ import java.util.Locale;
 
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
+import net.coreprotect.database.Database;
 
 public class UserStatement {
 
@@ -21,14 +22,32 @@ public class UserStatement {
 
         try {
             int unixtimestamp = (int) (System.currentTimeMillis() / 1000L);
-            PreparedStatement preparedStmt = connection.prepareStatement("INSERT INTO " + ConfigHandler.prefix + "user (time, user) VALUES (?, ?)", Statement.RETURN_GENERATED_KEYS);
+
+            PreparedStatement preparedStmt = null;
+            if (Database.hasReturningKeys()) {
+                preparedStmt = connection.prepareStatement("INSERT INTO " + ConfigHandler.prefix + "user (time, user) VALUES (?, ?) RETURNING rowid");
+            }
+            else {
+                preparedStmt = connection.prepareStatement("INSERT INTO " + ConfigHandler.prefix + "user (time, user) VALUES (?, ?)", Statement.RETURN_GENERATED_KEYS);
+            }
+
             preparedStmt.setInt(1, unixtimestamp);
             preparedStmt.setString(2, user);
+
+            if (Database.hasReturningKeys()) {
+                ResultSet resultSet = preparedStmt.executeQuery();
+                resultSet.next();
+                id = resultSet.getInt(1);
+                resultSet.close();
+            }
+            else {
                 preparedStmt.executeUpdate();
                 ResultSet keys = preparedStmt.getGeneratedKeys();
                 keys.next();
                 id = keys.getInt(1);
                 keys.close();
+            }
+
             preparedStmt.close();
         }
         catch (Exception e) {