Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-19 18:21:00 +02:00
Code Issues Projects Releases Wiki Activity

Fix compilation error

Browse Source
This commit is contained in:
Fuzzlemann 2017-08-23 14:11:50 +02:00
parent 2df6169dd9
commit 8bffdba725
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/src/main/java/com/djrapitops/plan/database/Database.java
View File

@ -331,8 +331,6 @@ public abstract class Database {
return serverTable; return serverTable;
} }
public abstract void commit() throws SQLException;
public ActionsTable getActionsTable() { public ActionsTable getActionsTable() {
return actionsTable; return actionsTable;
} }

22
Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
View File

@ -227,6 +227,7 @@ public abstract class SQLDB extends Database {
if (uuid == null) { if (uuid == null) {
return false; return false;
} }
try { try {
Benchmark.start("Remove Account"); Benchmark.start("Remove Account");
Log.debug("Database", "Removing Account: " + uuid); Log.debug("Database", "Removing Account: " + uuid);
@ -237,25 +238,20 @@ public abstract class SQLDB extends Database {
return false; return false;
} }
boolean success = true;
for (Table t : getAllTablesInRemoveOrder()) { for (Table t : getAllTablesInRemoveOrder()) {
if (t instanceof UserIDTable) { if (!(t instanceof UserIDTable)) {
UserIDTable table = (UserIDTable) t; continue;
success = table.removeUser(uuid); }
if (!success) {
break; UserIDTable table = (UserIDTable) t;
} if (!table.removeUser(uuid)) {
throw new IllegalStateException("Removal Failed");
} }
} }
if (success) { return true;
return true;
}
throw new IllegalStateException("Removal Failed");
} catch (Exception e) { } catch (Exception e) {
Log.toLog(this.getClass().getName(), e); Log.toLog(this.getClass().getName(), e);
rollback(); // TODO Test case
return false; return false;
} finally { } finally {
Benchmark.stop("Database", "Remove Account"); Benchmark.stop("Database", "Remove Account");

6
Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
View File

@ -1,11 +1,9 @@
package main.java.com.djrapitops.plan.database.tables; package main.java.com.djrapitops.plan.database.tables;
import com.djrapitops.plugin.utilities.Verify;
import main.java.com.djrapitops.plan.Log; import main.java.com.djrapitops.plan.Log;
import main.java.com.djrapitops.plan.database.databases.SQLDB; import main.java.com.djrapitops.plan.database.databases.SQLDB;
import main.java.com.djrapitops.plan.database.sql.Select; import main.java.com.djrapitops.plan.database.sql.*;
import main.java.com.djrapitops.plan.database.sql.Sql;
import main.java.com.djrapitops.plan.database.sql.TableSqlParser;
import main.java.com.djrapitops.plan.database.sql.Update;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;