From bacde537810a7e63020334af401eeedfc294dd19 Mon Sep 17 00:00:00 2001
From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com>
Date: Sun, 20 Nov 2022 19:56:32 +0200
Subject: [PATCH] Fix RemoveUsernameFromAccessLogPatch applying every time

---
 .../plan/storage/database/sql/tables/AccessLogTable.java     | 5 +++++
 .../patches/RemoveUsernameFromAccessLogPatch.java            | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/AccessLogTable.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/AccessLogTable.java
index 18582c590..14d99d12a 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/AccessLogTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/AccessLogTable.java
@@ -20,6 +20,11 @@ import com.djrapitops.plan.storage.database.DBType;
 import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder;
 import com.djrapitops.plan.storage.database.sql.building.Sql;
 
+/**
+ * Represents plan_access_log table.
+ *
+ * @see com.djrapitops.plan.storage.database.transactions.patches.RemoveUsernameFromAccessLogPatch
+ */
 public class AccessLogTable {
 
     public static final String TABLE_NAME = "plan_access_log";
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveUsernameFromAccessLogPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveUsernameFromAccessLogPatch.java
index 2ac61ffbd..b17ce9bd8 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveUsernameFromAccessLogPatch.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/RemoveUsernameFromAccessLogPatch.java
@@ -28,6 +28,8 @@ import java.sql.Types;
 import static com.djrapitops.plan.storage.database.sql.building.Sql.*;
 
 /**
+ * Sets username fields to NULL in plan_access_log table.
+ *
  * @author AuroraLS3
  */
 public class RemoveUsernameFromAccessLogPatch extends Patch {
@@ -37,7 +39,10 @@ public class RemoveUsernameFromAccessLogPatch extends Patch {
         if (!hasColumn(AccessLogTable.TABLE_NAME, "username")) {
             return true;
         }
+        return !hasUsernames();
+    }
 
+    private Boolean hasUsernames() {
         String sql = SELECT + "COUNT(*) as c" +
                 FROM + AccessLogTable.TABLE_NAME +
                 WHERE + "username" + IS_NOT_NULL;