From 8b550a2349c4f24e01f8b7588cc3dd0026baaee7 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sun, 20 Aug 2017 13:06:39 +0300 Subject: [PATCH] Planned DB Changes --- .../plan/database/tables/ActionsTable.java | 15 ++++++ .../plan/database/tables/CommandUseTable.java | 2 + .../plan/database/tables/GMTimesTable.java | 2 + .../plan/database/tables/IPsTable.java | 2 + .../plan/database/tables/KillsTable.java | 4 ++ .../plan/database/tables/NicknamesTable.java | 2 + .../plan/database/tables/ServerTable.java | 16 ++++++ .../plan/database/tables/SessionsTable.java | 8 +++ .../plan/database/tables/TPSTable.java | 2 + .../plan/database/tables/UsersTable.java | 51 ++++++------------- .../plan/database/tables/WorldTable.java | 2 + .../plan/database/tables/WorldTimesTable.java | 5 +- 12 files changed, 75 insertions(+), 36 deletions(-) create mode 100644 Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java create mode 100644 Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java new file mode 100644 index 000000000..19eca2612 --- /dev/null +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/ActionsTable.java @@ -0,0 +1,15 @@ +/* + * Licence is provided in the jar as license.yml also here: + * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml + */ +package main.java.com.djrapitops.plan.database.tables; + +/** + * //TODO Class Javadoc Comment + * + * @author Rsl1122 + */ +public class ActionsTable { + // TODO Actions table + // time, action, additional info +} \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java index dab6450a0..aa2e64caa 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java @@ -20,6 +20,7 @@ public class CommandUseTable extends Table { private final String columnCommand; private final String columnTimesUsed; + private final String columnServerID; //TODO /** * @param db @@ -29,6 +30,7 @@ public class CommandUseTable extends Table { super("plan_commandusages", db, usingMySQL); columnCommand = "command"; columnTimesUsed = "times_used"; + columnServerID = "server_id"; } /** diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java index 6dd8c4e91..ebd836187 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java @@ -16,7 +16,9 @@ import java.util.*; /** * @author Rsl1122 + * @deprecated GM Times moved to WorldTable */ +@Deprecated public class GMTimesTable extends UserIDTable { private final String columnSurvivalTime; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java index c2cd9d055..bdff46e47 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/IPsTable.java @@ -20,6 +20,7 @@ import java.util.*; public class IPsTable extends UserIDTable { private final String columnIP; + private final String columnGeolocation; // TODO /** * @param db The database @@ -29,6 +30,7 @@ public class IPsTable extends UserIDTable { super("plan_ips", db, usingMySQL); columnUserID = "user_id"; columnIP = "ip"; + columnGeolocation = "geolocation"; } /** diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java index d18da1cbc..00d4ac15b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java @@ -22,6 +22,8 @@ public class KillsTable extends Table { private final String columnVictimUserID; private final String columnWeapon; private final String columnDate; + private final String columnServerID; //TODO + private final String columnSessionID; //TODO /** * @param db @@ -33,6 +35,8 @@ public class KillsTable extends Table { columnDate = "date"; columnKillerUserID = "killer_id"; columnVictimUserID = "victim_id"; + columnServerID = "server_id"; + columnSessionID = "session_id"; } /** diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java index 63b221fcf..de205493b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java @@ -19,6 +19,7 @@ public class NicknamesTable extends UserIDTable { private final String columnNick; private final String columnCurrent; + private final String columnServerID; //TODO /** * @param db The database @@ -29,6 +30,7 @@ public class NicknamesTable extends UserIDTable { columnUserID = "user_id"; columnNick = "nickname"; columnCurrent = "current_nick"; + columnServerID = "server_id"; } /** diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java new file mode 100644 index 000000000..0f26d8981 --- /dev/null +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java @@ -0,0 +1,16 @@ +/* + * Licence is provided in the jar as license.yml also here: + * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml + */ +package main.java.com.djrapitops.plan.database.tables; + +/** + * //TODO Class Javadoc Comment + * + * @author Rsl1122 + */ +public class ServerTable { + //TODO Server Table + + // id, uuid, webserver info, name +} \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java index 390060b76..e810318ac 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java @@ -18,8 +18,12 @@ import java.util.*; */ public class SessionsTable extends UserIDTable { + private final String columnSessionID; //TODO private final String columnSessionStart; private final String columnSessionEnd; + private final String columnServerID; //TODO + private final String columnMobKills; //TODO + private final String columnDeaths; //TODO /** * @param db @@ -30,6 +34,10 @@ public class SessionsTable extends UserIDTable { columnUserID = "user_id"; columnSessionStart = "session_start"; columnSessionEnd = "session_end"; + columnServerID = "server_id"; + columnSessionID = "id"; + columnMobKills = "mob_kills"; + columnDeaths = "deaths"; } /** diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java index 209c0d0e7..47647ef12 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java @@ -24,6 +24,7 @@ import java.util.List; */ public class TPSTable extends Table { + private final String columnServerID; //TODO private final String columnDate; private final String columnTPS; private final String columnPlayers; @@ -38,6 +39,7 @@ public class TPSTable extends Table { */ public TPSTable(SQLDB db, boolean usingMySQL) { super("plan_tps", db, usingMySQL); + columnServerID = "server_id"; columnDate = "date"; columnTPS = "tps"; columnPlayers = "players_online"; diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java index da7248f34..8c5f62842 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java @@ -27,42 +27,23 @@ public class UsersTable extends Table { private final String columnID; private final String columnUUID; - private final String columnGeolocation; - private final String columnLastGM; - private final String columnLastGMSwapTime; - private final String columnPlayTime; - private final String columnLoginTimes; - private final String columnLastPlayed; - private final String columnDeaths; - private final String columnMobKills; - /** - * @since 3.3.0 - */ + @Deprecated private final String columnGeolocation; + @Deprecated private final String columnLastGM; + @Deprecated private final String columnLastGMSwapTime; + @Deprecated private final String columnPlayTime; + @Deprecated private final String columnLoginTimes; + @Deprecated private final String columnLastPlayed; + @Deprecated private final String columnDeaths; + @Deprecated private final String columnMobKills; private final String columnRegistered; - /** - * @since 3.3.0 - */ - private final String columnOP; - /** - * @since 3.3.0 - */ - private final String columnName; - /** - * @since 3.3.0 - */ - private final String columnBanned; - /** - * @since 3.3.0 - */ - private final String columnContainsBukkitData; - /** - * @since 3.6.0 - */ - private final String columnLastWorldSwapTime; - /** - * @since 3.6.0 - */ - private final String columnLastWorld; + //TODO Server Specific Table (Also has registered on it) + @Deprecated private final String columnOP; + @Deprecated private final String columnName; + @Deprecated private final String columnBanned; + // + @Deprecated private final String columnContainsBukkitData; + @Deprecated private final String columnLastWorldSwapTime; + @Deprecated private final String columnLastWorld; /** * @param db diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java index 1059e408d..b96ec2623 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java @@ -25,6 +25,7 @@ public class WorldTable extends Table { private final String columnWorldId; private final String columnWorldName; + private final String columnServerID; //TODO /** * Constructor. @@ -36,6 +37,7 @@ public class WorldTable extends Table { super("plan_worlds", db, usingMySQL); columnWorldId = "world_id"; columnWorldName = "world_name"; + columnServerID = "server_id"; } @Override diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java index 8ef5f8bd8..595b91359 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java @@ -21,12 +21,14 @@ import java.util.Map; */ public class WorldTimesTable extends UserIDTable { + private final String columnServerID; //TODO private final WorldTable worldTable; private final String worldIDColumn; private final String worldNameColumn; private final String columnWorldId; - private final String columnPlaytime; + @Deprecated private final String columnPlaytime; + //TODO GM Times to World table private final String selectWorldIDsql; @@ -44,6 +46,7 @@ public class WorldTimesTable extends UserIDTable { columnWorldId = "world_id"; columnUserID = "user_id"; columnPlaytime = "playtime"; + columnServerID = "server_id"; selectWorldIDsql = "(SELECT " + worldIDColumn + " FROM " + worldTable + " WHERE (" + worldNameColumn + "=?))"; }