mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-07 17:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[#900] Changed GROUP BY to group by world_name instead

Browse Source 
This fix has also been pushed on a more upstream branch, but to get a
working version to the user this commit was made.
This commit is contained in:
Rsl1122 2019-01-27 11:45:41 +02:00
parent ecf8cd9baf
commit 610cbf955d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTimesTable.java
View File

@ -178,7 +178,7 @@ public class WorldTimesTable extends UserUUIDTable {
public WorldTimes getWorldTimesOfServer(UUID serverUUID) { public WorldTimes getWorldTimesOfServer(UUID serverUUID) {
String worldIDColumn = worldTable + "." + WorldTable.Col.ID; String worldIDColumn = worldTable + "." + WorldTable.Col.ID;
String worldNameColumn = worldTable + "." + WorldTable.Col.NAME + " as world_name"; String worldNameColumn = worldTable + "." + WorldTable.Col.NAME + " as world";
String sql = "SELECT " + String sql = "SELECT " +
"SUM(" + Col.SURVIVAL + ") as survival, " + "SUM(" + Col.SURVIVAL + ") as survival, " +
"SUM(" + Col.CREATIVE + ") as creative, " + "SUM(" + Col.CREATIVE + ") as creative, " +
@ -188,7 +188,7 @@ public class WorldTimesTable extends UserUUIDTable {
" FROM " + tableName + " FROM " + tableName +
" INNER JOIN " + worldTable + " on " + worldIDColumn + "=" + Col.WORLD_ID + " INNER JOIN " + worldTable + " on " + worldIDColumn + "=" + Col.WORLD_ID +
" WHERE " + tableName + "." + Col.SERVER_UUID + "=?" + " WHERE " + tableName + "." + Col.SERVER_UUID + "=?" +
" GROUP BY " + Col.WORLD_ID; " GROUP BY world";
return query(new QueryStatement<WorldTimes>(sql, 1000) { return query(new QueryStatement<WorldTimes>(sql, 1000) {
@Override @Override
@ -202,7 +202,7 @@ public class WorldTimesTable extends UserUUIDTable {
WorldTimes worldTimes = new WorldTimes(new HashMap<>()); WorldTimes worldTimes = new WorldTimes(new HashMap<>());
while (set.next()) { while (set.next()) {
String worldName = set.getString("world_name"); String worldName = set.getString("world");
Map<String, Long> gmMap = new HashMap<>(); Map<String, Long> gmMap = new HashMap<>();
gmMap.put(gms[0], set.getLong("survival")); gmMap.put(gms[0], set.getLong("survival"));
@ -220,7 +220,7 @@ public class WorldTimesTable extends UserUUIDTable {
public WorldTimes getWorldTimesOfUser(UUID uuid) { public WorldTimes getWorldTimesOfUser(UUID uuid) {
String worldIDColumn = worldTable + "." + WorldTable.Col.ID; String worldIDColumn = worldTable + "." + WorldTable.Col.ID;
String worldNameColumn = worldTable + "." + WorldTable.Col.NAME + " as world_name"; String worldNameColumn = worldTable + "." + WorldTable.Col.NAME + " as world";
String sql = "SELECT " + String sql = "SELECT " +
"SUM(" + Col.SURVIVAL + ") as survival, " + "SUM(" + Col.SURVIVAL + ") as survival, " +
"SUM(" + Col.CREATIVE + ") as creative, " + "SUM(" + Col.CREATIVE + ") as creative, " +
@ -230,7 +230,7 @@ public class WorldTimesTable extends UserUUIDTable {
" FROM " + tableName + " FROM " + tableName +
" INNER JOIN " + worldTable + " on " + worldIDColumn + "=" + Col.WORLD_ID + " INNER JOIN " + worldTable + " on " + worldIDColumn + "=" + Col.WORLD_ID +
" WHERE " + Col.UUID + "=?" + " WHERE " + Col.UUID + "=?" +
" GROUP BY " + Col.WORLD_ID; " GROUP BY world";
return query(new QueryStatement<WorldTimes>(sql) { return query(new QueryStatement<WorldTimes>(sql) {
@Override @Override
@ -244,7 +244,7 @@ public class WorldTimesTable extends UserUUIDTable {
WorldTimes worldTimes = new WorldTimes(new HashMap<>()); WorldTimes worldTimes = new WorldTimes(new HashMap<>());
while (set.next()) { while (set.next()) {
String worldName = set.getString("world_name"); String worldName = set.getString("world");
Map<String, Long> gmMap = new HashMap<>(); Map<String, Long> gmMap = new HashMap<>();
gmMap.put(gms[0], set.getLong("survival")); gmMap.put(gms[0], set.getLong("survival"));
@ -262,7 +262,7 @@ public class WorldTimesTable extends UserUUIDTable {
public Map<Integer, WorldTimes> getAllWorldTimesBySessionID() { public Map<Integer, WorldTimes> getAllWorldTimesBySessionID() {
String worldIDColumn = worldTable + "." + WorldTable.Col.ID; String worldIDColumn = worldTable + "." + WorldTable.Col.ID;
String worldNameColumn = worldTable + "." + WorldTable.Col.NAME + " as world_name"; String worldNameColumn = worldTable + "." + WorldTable.Col.NAME + " as world";
String sql = "SELECT " + String sql = "SELECT " +
Col.SESSION_ID + ", " + Col.SESSION_ID + ", " +
Col.SURVIVAL + ", " + Col.SURVIVAL + ", " +
@ -282,7 +282,7 @@ public class WorldTimesTable extends UserUUIDTable {
while (set.next()) { while (set.next()) {
int sessionID = set.getInt(Col.SESSION_ID.get()); int sessionID = set.getInt(Col.SESSION_ID.get());
String worldName = set.getString("world_name"); String worldName = set.getString("world");
Map<String, Long> gmMap = new HashMap<>(); Map<String, Long> gmMap = new HashMap<>();
gmMap.put(gms[0], set.getLong(Col.SURVIVAL.get())); gmMap.put(gms[0], set.getLong(Col.SURVIVAL.get()));