diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java index 20e847f53..3541040f3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java @@ -85,7 +85,7 @@ public class ActionsTable extends UserIDTable { statement.setString(5, action.getAdditionalInfo()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement, connection); } @@ -198,7 +198,7 @@ public class ActionsTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement, connection); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java index 230428e9c..385b3554c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java @@ -118,7 +118,7 @@ public class CommandUseTable extends Table { statement.setString(2, command); int success = statement.executeUpdate(); - connection.commit(); + commit(connection); if (success == 0) { insertCommand(command); @@ -139,7 +139,7 @@ public class CommandUseTable extends Table { statement.setString(3, Plan.getServerUUID().toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement, connection); } @@ -239,7 +239,7 @@ public class CommandUseTable extends Table { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java index 701e3d64b..23204bdcd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java @@ -104,7 +104,7 @@ public class IPsTable extends UserIDTable { statement.setString(3, geolocation); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -216,7 +216,7 @@ public class IPsTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java index 23aa7b632..842f7b135 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java @@ -78,7 +78,7 @@ public class KillsTable extends UserIDTable { statement.setString(2, uuid.toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -104,7 +104,7 @@ public class KillsTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -231,7 +231,7 @@ public class KillsTable extends UserIDTable { } } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java index d553b76be..d20cd60f5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java @@ -155,7 +155,7 @@ public class NicknamesTable extends UserIDTable { statement.setString(3, displayName); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -223,7 +223,7 @@ public class NicknamesTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java index 3cf688dc8..2c71beac0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/SecurityTable.java @@ -57,7 +57,7 @@ public class SecurityTable extends Table { statement.setString(1, user); statement.execute(); - connection.commit(); + commit(connection); return true; } catch (SQLException ex) { Log.toLog(this.getClass().getName(), ex); @@ -80,7 +80,7 @@ public class SecurityTable extends Table { statement.setInt(3, permLevel); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -148,7 +148,7 @@ public class SecurityTable extends Table { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java index fa0dedf1b..c29d5eb04 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java @@ -97,7 +97,7 @@ public class ServerTable extends Table { statement.setInt(6, info.getId()); statement.executeUpdate(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -126,7 +126,7 @@ public class ServerTable extends Table { statement.setInt(5, info.getMaxPlayers()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -293,7 +293,7 @@ public class ServerTable extends Table { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java index 2f112c872..a1d23f1c2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java @@ -114,7 +114,7 @@ public class SessionsTable extends UserIDTable { statement.setString(6, Plan.getServerUUID().toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -621,7 +621,7 @@ public class SessionsTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java index 5ef29359c..c6f0dfa81 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java @@ -122,7 +122,7 @@ public class TPSTable extends Table { statement.setDouble(8, tps.getChunksLoaded()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -149,7 +149,7 @@ public class TPSTable extends Table { statement.setLong(2, MiscUtils.getTime() - fiveWeeks); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -266,7 +266,7 @@ public class TPSTable extends Table { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java index f92dc9a89..2b70b2136 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/Table.java @@ -84,7 +84,7 @@ public abstract class Table { try (Connection connection = getConnection()){ statement = connection.createStatement(); boolean b = statement.execute(statementString); - connection.commit(); + commit(connection); return b; } finally { close(statement); @@ -173,6 +173,10 @@ public abstract class Table { Objects.equal(db, table.db); } + protected void commit(Connection connection) throws SQLException { + db.commit(connection); + } + @Override public int hashCode() { return Objects.hashCode(tableName, db, usingMySQL); diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java index 6e90d08f1..0f57caa92 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserIDTable.java @@ -31,7 +31,7 @@ public abstract class UserIDTable extends Table { statement.setString(1, uuid.toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java index 002ec1c32..1bb54e51e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java @@ -74,7 +74,7 @@ public class UserInfoTable extends UserIDTable { statement.setString(3, Plan.getServerUUID().toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -106,7 +106,7 @@ public class UserInfoTable extends UserIDTable { statement.setString(3, uuid.toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -269,7 +269,7 @@ public class UserInfoTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java index 24e62b5f9..233fe4561 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java @@ -90,7 +90,7 @@ public class UsersTable extends UserIDTable { statement.setString(1, uuid.toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -170,7 +170,7 @@ public class UsersTable extends UserIDTable { statement.setString(3, name); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -201,7 +201,7 @@ public class UsersTable extends UserIDTable { statement.setString(2, uuid.toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -234,7 +234,7 @@ public class UsersTable extends UserIDTable { statement.setString(1, uuid.toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -328,7 +328,7 @@ public class UsersTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -373,7 +373,7 @@ public class UsersTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java index 27025e2b1..b1489579c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/VersionTable.java @@ -87,7 +87,7 @@ public class VersionTable extends Table { statement = connection.prepareStatement("INSERT INTO " + tableName + " (version) VALUES (" + version + ")"); statement.executeUpdate(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java index 9518bdf13..117ac07ed 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java @@ -100,7 +100,7 @@ public class WorldTable extends Table { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java index 792acfd29..252487f04 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java @@ -106,7 +106,7 @@ public class WorldTimesTable extends UserIDTable { } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -303,7 +303,7 @@ public class WorldTimesTable extends UserIDTable { } } statement.executeBatch(); - connection.commit(); + commit(connection); } finally { close(statement); } diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java index 8be3ed67f..ca7fd2efe 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/ProtocolTable.java @@ -100,7 +100,7 @@ public class ProtocolTable extends Table { statement.setString(2, uuid.toString()); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); } @@ -118,7 +118,7 @@ public class ProtocolTable extends Table { statement.setInt(2, version); statement.execute(); - connection.commit(); + commit(connection); } finally { close(statement); }