diff --git a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java index faea07a2b..91ec457c4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java @@ -170,16 +170,21 @@ public class UserInfoTable extends UserIDTable { } public List getServerUserInfo(UUID serverUUID) throws SQLException { + Optional serverID = serverTable.getServerID(serverUUID); + if (!serverID.isPresent()) { + return new ArrayList<>(); + } + Map playerNames = usersTable.getPlayerNames(); Map uuidsByID = usersTable.getUUIDsByID(); String sql = "SELECT * FROM " + tableName + - " WHERE " + Col.SERVER_ID + "=" + serverTable.statementSelectServerID; + " WHERE " + Col.SERVER_ID + "=?"; return query(new QueryStatement>(sql, 20000) { @Override public void prepare(PreparedStatement statement) throws SQLException { - statement.setString(1, serverUUID.toString()); + statement.setInt(1, serverID.get()); } @Override diff --git a/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java b/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java index cb9e73e1b..2ce44c4da 100644 --- a/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java +++ b/Plan/src/test/java/com/djrapitops/plan/system/database/databases/SQLiteTest.java @@ -20,7 +20,6 @@ import com.djrapitops.plan.system.info.server.Server; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.processing.processors.player.RegisterProcessor; import com.djrapitops.plan.utilities.Base64Util; -import com.djrapitops.plan.utilities.ManageUtils; import com.djrapitops.plan.utilities.SHA256Hash; import com.djrapitops.plan.utilities.analysis.MathUtils; import com.djrapitops.plugin.StaticHolder; @@ -759,7 +758,7 @@ public class SQLiteTest { } @Test - public void testBackupAndRestore() throws SQLException, DBInitException, UnsupportedEncodingException, NoSuchAlgorithmException { + public void testBackupAndRestore() throws SQLException, DBException, UnsupportedEncodingException, NoSuchAlgorithmException { System.out.println("- Creating Backup Database -"); SQLiteDB backup = new SQLiteDB("debug-backup" + System.currentTimeMillis()); backup.init(); @@ -767,7 +766,7 @@ public class SQLiteTest { saveAllData(db); - ManageUtils.clearAndCopy(backup, db); + db.backup().backup(backup); UserInfoTable userInfoTable = backup.getUserInfoTable(); UsersTable usersTable = backup.getUsersTable();