Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix PlayerTableRowPatch is applied check

This commit is contained in:
Aurora Lahtela 2023-01-22 14:31:10 +02:00
parent acf9d92b1d
commit 63350a4fea
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/PlayerTableRowPatch.java
View File

@ -43,10 +43,10 @@ public class PlayerTableRowPatch extends Patch {
private boolean tableRowIdsAreUniquePerTableId() {
String columnCountPerTableSql = SELECT +
TABLE_ID + ",COUNT(1) as c" +
USER_UUID + ',' + TABLE_ID + ",COUNT(1) as c" +
FROM + TABLE_NAME +
WHERE + TABLE_ROW + "=?" +
GROUP_BY + TABLE_ID;
GROUP_BY + TABLE_ID + ',' + USER_UUID;
return query(new QueryStatement<>(columnCountPerTableSql) {
@Override
public void prepare(PreparedStatement statement) throws SQLException {

4
Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/ServerTableRowPatch.java
View File

@ -43,10 +43,10 @@ public class ServerTableRowPatch extends Patch {
private boolean tableRowIdsAreUniquePerTableId() {
String columnCountPerTableSql = SELECT +
TABLE_ID + ",COUNT(1) as c" +
SERVER_UUID + ',' + TABLE_ID + ",COUNT(1) as c" +
FROM + TABLE_NAME +
WHERE + TABLE_ROW + "=?" +
GROUP_BY + TABLE_ID;
GROUP_BY + TABLE_ID + ',' + SERVER_UUID;
return query(new QueryStatement<>(columnCountPerTableSql) {
@Override
public void prepare(PreparedStatement statement) throws SQLException {

2
Plan/common/src/test/java/utilities/RandomData.java
View File

@ -119,7 +119,7 @@ public class RandomData {
public static FinishedSession randomSession(ServerUUID serverUUID, String[] worlds, long start, UUID... uuids) {
DataMap extraData = new DataMap();
extraData.put(WorldTimes.class, RandomData.randomWorldTimes(worlds));
long end = RandomData.randomTimeAfter(start);
long end = RandomData.randomTimeAfter(start + 1);
if (uuids.length >= 2) {
List<PlayerKill> kills = RandomData.randomKills(serverUUID, uuids[0], pickAtRandom(Arrays.copyOfRange(uuids, 1, uuids.length)));