R3944Realms/PlayerSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clarify executeUpdate variants with and without db

Browse Source 
(cherry picked from commit 8f77a96544)
This commit is contained in:
EoD 2025-07-19 19:38:38 +00:00 committed by github-actions[bot]
parent 9880c7e74c
commit 6ddd776468
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/vip/fubuki/playersync/PlayerSync.java
View File

@ -49,7 +49,7 @@ public class PlayerSync {
String dbName = JdbcConfig.DATABASE_NAME.get(); String dbName = JdbcConfig.DATABASE_NAME.get();
// Step 1: Create the database using a connection that does not select a database. // Step 1: Create the database using a connection that does not select a database.
JDBCsetUp.executeUpdate("CREATE DATABASE IF NOT EXISTS " + dbName, 1); JDBCsetUp.executeUpdateWithoutDatabase("CREATE DATABASE IF NOT EXISTS " + dbName);
// Step 2: Explicitly select the database on a connection obtained without default database. // Step 2: Explicitly select the database on a connection obtained without default database.
try (Connection conn = JDBCsetUp.getConnection(false); try (Connection conn = JDBCsetUp.getConnection(false);
@ -130,10 +130,10 @@ public class PlayerSync {
// Create backpack_data table // Create backpack_data table
if (ModList.get().isLoaded("sophisticatedbackpacks")) { if (ModList.get().isLoaded("sophisticatedbackpacks")) {
JDBCsetUp.executeUpdate( JDBCsetUp.executeUpdateWithoutDatabase(
"CREATE TABLE IF NOT EXISTS " + dbName + ".backpack_data (" + "CREATE TABLE IF NOT EXISTS " + dbName + ".backpack_data (" +
"uuid CHAR(36) NOT NULL, backpack_nbt MEDIUMBLOB, PRIMARY KEY (uuid)" + "uuid CHAR(36) NOT NULL, backpack_nbt MEDIUMBLOB, PRIMARY KEY (uuid)" +
");", 1 ");"
); );
// Check if backpack_data table has the 'uuid' column // Check if backpack_data table has the 'uuid' column
@ -147,8 +147,8 @@ public class PlayerSync {
if (rsBackpackCol.next() && rsBackpackCol.getInt("colCount") == 0) { if (rsBackpackCol.next() && rsBackpackCol.getInt("colCount") == 0) {
LOGGER.info("Altering backpack_data table to add missing 'uuid' column."); LOGGER.info("Altering backpack_data table to add missing 'uuid' column.");
// Add the missing column and set it as primary key. // Add the missing column and set it as primary key.
JDBCsetUp.executeUpdate("ALTER TABLE " + dbName + ".backpack_data ADD COLUMN uuid CHAR(36) NOT NULL", 1); JDBCsetUp.executeUpdateWithoutDatabase("ALTER TABLE " + dbName + ".backpack_data ADD COLUMN uuid CHAR(36) NOT NULL");
JDBCsetUp.executeUpdate("ALTER TABLE " + dbName + ".backpack_data ADD PRIMARY KEY (uuid)", 1); JDBCsetUp.executeUpdateWithoutDatabase("ALTER TABLE " + dbName + ".backpack_data ADD PRIMARY KEY (uuid)");
} }
rsBackpackCol.close(); rsBackpackCol.close();
backpackColCheck.connection().close(); backpackColCheck.connection().close();
@ -166,7 +166,7 @@ public class PlayerSync {
String dataType = rsAdvCol.getString("DATA_TYPE"); String dataType = rsAdvCol.getString("DATA_TYPE");
if (!"mediumblob".equalsIgnoreCase(dataType)) { if (!"mediumblob".equalsIgnoreCase(dataType)) {
LOGGER.info("Altering player_data table to modify 'advancements' column from {} to MEDIUMBLOB.", dataType); LOGGER.info("Altering player_data table to modify 'advancements' column from {} to MEDIUMBLOB.", dataType);
JDBCsetUp.executeUpdate("ALTER TABLE " + dbName + ".player_data MODIFY COLUMN advancements MEDIUMBLOB", 1); JDBCsetUp.executeUpdateWithoutDatabase("ALTER TABLE " + dbName + ".player_data MODIFY COLUMN advancements MEDIUMBLOB");
} }
} }
rsAdvCol.close(); rsAdvCol.close();

22
src/main/java/vip/fubuki/playersync/util/JDBCsetUp.java
View File

@ -52,28 +52,30 @@ public class JDBCsetUp {
} }
/** /**
* Executes an update using a connection that includes the database. * Executes an update using a connection with or without the database within the JDBC URL
*/ */
public static void executeUpdate(String sql) throws SQLException { private static void executeUpdate(boolean selectDatabase, String sql) throws SQLException {
LOGGER.trace(sql); LOGGER.trace(sql);
try (Connection connection = getConnection()) { // With database selected try (Connection connection = getConnection(selectDatabase)) {
try (PreparedStatement updateStatement = connection.prepareStatement(sql)) { try (PreparedStatement updateStatement = connection.prepareStatement(sql)) {
updateStatement.executeUpdate(); updateStatement.executeUpdate();
} }
} }
} }
/**
* Executes an update using a connection that includes the database in the JDBC URL
*/
public static void executeUpdate(String sql) throws SQLException {
executeUpdate(true, sql);
}
/** /**
* Executes an update using a connection that does NOT include a default database. * Executes an update using a connection that does NOT include a default database.
* This method is used for commands like "CREATE DATABASE IF NOT EXISTS ..." * This method is used for commands like "CREATE DATABASE IF NOT EXISTS ..."
*/ */
public static void executeUpdate(String sql, int dummy) throws SQLException { public static void executeUpdateWithoutDatabase(String sql) throws SQLException {
LOGGER.trace(sql); executeUpdate(false, sql);
try (Connection connection = getConnection(false)) { // Without default database
try (PreparedStatement updateStatement = connection.prepareStatement(sql)) {
updateStatement.executeUpdate();
}
}
} }
/** /**