From 113ca21343b021938ee97ccb4a75700dc57bde4d Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 9 Nov 2019 17:57:10 +0200 Subject: [PATCH] Changed a query using wrong table Activity index grouping query for /network page was using plan_user_info instead of plan_users. This lead to duplication of users if a player had played on multiple servers. Affects issues: - Fixed #1216 --- .../queries/analysis/NetworkActivityIndexQueries.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java index 7049f6c6f..d9ffe9444 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/NetworkActivityIndexQueries.java @@ -20,7 +20,6 @@ import com.djrapitops.plan.delivery.domain.mutators.ActivityIndex; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.QueryStatement; import com.djrapitops.plan.storage.database.sql.tables.SessionsTable; -import com.djrapitops.plan.storage.database.sql.tables.UserInfoTable; import com.djrapitops.plan.storage.database.sql.tables.UsersTable; import java.sql.PreparedStatement; @@ -141,9 +140,9 @@ public class NetworkActivityIndexQueries { String selectActivityIndex = selectActivityIndexSQL(); String selectIndexes = SELECT + "? as activity_group, activity_index" + - FROM + UserInfoTable.TABLE_NAME + " u" + - LEFT_JOIN + '(' + selectActivityIndex + ") s on s." + SessionsTable.USER_UUID + "=u." + UserInfoTable.USER_UUID + - AND + "u." + UserInfoTable.REGISTERED + "<=?"; + FROM + UsersTable.TABLE_NAME + " u" + + LEFT_JOIN + '(' + selectActivityIndex + ") s on s." + SessionsTable.USER_UUID + "=u." + UsersTable.USER_UUID + + AND + "u." + UsersTable.REGISTERED + "<=?"; String selectCount = SELECT + "activity_group, COUNT(1) as count" + FROM + '(' + selectIndexes + ") indexes" +