Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-08 03:39:42 +01:00
Code Issues Projects Releases Wiki Activity

Revert attempt to fix duplicate players on Players table

Browse Source
This commit is contained in:
Rsl1122 2019-09-21 10:52:35 +03:00
parent 146c990eb6
commit 59022774b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/NetworkTablePlayersQuery.java
View File

@ -67,7 +67,7 @@ public class NetworkTablePlayersQuery implements Query<List<TablePlayer>> {
GROUP_BY + GeoInfoTable.USER_UUID; GROUP_BY + GeoInfoTable.USER_UUID;
String selectLatestGeolocations = SELECT + String selectLatestGeolocations = SELECT +
"g1." + GeoInfoTable.GEOLOCATION + ',' + "g1." + GeoInfoTable.GEOLOCATION + ',' +
DISTINCT + "g1." + GeoInfoTable.USER_UUID + "g1." + GeoInfoTable.USER_UUID +
FROM + "(" + selectGeolocations + ") AS g1" + FROM + "(" + selectGeolocations + ") AS g1" +
INNER_JOIN + "(" + selectLatestGeolocationDate + ") AS g2 ON g1.uuid = g2.uuid" + INNER_JOIN + "(" + selectLatestGeolocationDate + ") AS g2 ON g1.uuid = g2.uuid" +
WHERE + GeoInfoTable.LAST_USED + "=last_used_g"; WHERE + GeoInfoTable.LAST_USED + "=last_used_g";
@ -79,12 +79,12 @@ public class NetworkTablePlayersQuery implements Query<List<TablePlayer>> {
FROM + SessionsTable.TABLE_NAME + " s" + FROM + SessionsTable.TABLE_NAME + " s" +
GROUP_BY + "s." + SessionsTable.USER_UUID; GROUP_BY + "s." + SessionsTable.USER_UUID;
String selectBanned = SELECT + DISTINCT + "ub." + UserInfoTable.USER_UUID + String selectBanned = SELECT + "ub." + UserInfoTable.USER_UUID +
FROM + UserInfoTable.TABLE_NAME + " ub" + FROM + UserInfoTable.TABLE_NAME + " ub" +
WHERE + UserInfoTable.BANNED + "=?"; WHERE + UserInfoTable.BANNED + "=?";
String selectBaseUsers = SELECT + String selectBaseUsers = SELECT +
DISTINCT + "u." + UsersTable.USER_UUID + ',' + "u." + UsersTable.USER_UUID + ',' +
"u." + UsersTable.USER_NAME + ',' + "u." + UsersTable.USER_NAME + ',' +
"u." + UsersTable.REGISTERED + ',' + "u." + UsersTable.REGISTERED + ',' +
"ban." + UserInfoTable.USER_UUID + " as banned," + "ban." + UserInfoTable.USER_UUID + " as banned," +