From 8bffdba72568b4dcf321b2bc1de5363ba5c63fd1 Mon Sep 17 00:00:00 2001
From: Fuzzlemann <zhang.paul@ymail.com>
Date: Wed, 23 Aug 2017 14:11:50 +0200
Subject: [PATCH] Fix compilation error

---
 .../djrapitops/plan/database/Database.java    |  2 --
 .../plan/database/databases/SQLDB.java        | 22 ++++++++-----------
 .../plan/database/tables/UsersTable.java      |  6 ++---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/database/Database.java b/Plan/src/main/java/com/djrapitops/plan/database/Database.java
index a22d08da9..b1bd30b3a 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/Database.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/Database.java
@@ -331,8 +331,6 @@ public abstract class Database {
         return serverTable;
     }
 
-    public abstract void commit() throws SQLException;
-
     public ActionsTable getActionsTable() {
         return actionsTable;
     }
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
index 29f8c6e29..37842ad89 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
@@ -227,6 +227,7 @@ public abstract class SQLDB extends Database {
         if (uuid == null) {
             return false;
         }
+
         try {
             Benchmark.start("Remove Account");
             Log.debug("Database", "Removing Account: " + uuid);
@@ -237,25 +238,20 @@ public abstract class SQLDB extends Database {
                 return false;
             }
 
-            boolean success = true;
             for (Table t : getAllTablesInRemoveOrder()) {
-                if (t instanceof UserIDTable) {
-                    UserIDTable table = (UserIDTable) t;
-                    success = table.removeUser(uuid);
-                    if (!success) {
-                        break;
-                    }
+                if (!(t instanceof UserIDTable)) {
+                    continue;
+                }
+
+                UserIDTable table = (UserIDTable) t;
+                if (!table.removeUser(uuid)) {
+                    throw new IllegalStateException("Removal Failed");
                 }
             }
 
-            if (success) {
-                return true;
-            }
-
-            throw new IllegalStateException("Removal Failed");
+            return true;
         } catch (Exception e) {
             Log.toLog(this.getClass().getName(), e);
-            rollback(); // TODO Test case
             return false;
         } finally {
             Benchmark.stop("Database", "Remove Account");
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 76d44bb33..7307bf9c8 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
@@ -1,11 +1,9 @@
 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.database.databases.SQLDB;
-import main.java.com.djrapitops.plan.database.sql.Select;
-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 main.java.com.djrapitops.plan.database.sql.*;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;