[#860] Fixed MySQL errno 150

Fixed by disabling foreign key checks before applying patches and enabling afterwards. Error was caused by re-creation of plan_sessions table during plan_world_times creation (This was done by the database engine), but plan_sessions was referenced by temp_world_times and so could not be recreated as those references would become invalid.
plan-player-analytics · Jan 12, 2019 · 4767de6 · 4767de6
1 parent 8edc621
commit 4767de6
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 22 deletions.
diff --git a/...c/main/java/com/djrapitops/plan/system/database/databases/sql/patches/DiskUsagePatch.java b/...c/main/java/com/djrapitops/plan/system/database/databases/sql/patches/DiskUsagePatch.java
@@ -31,7 +31,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         addColumn(TPSTable.TABLE_NAME,
                 TPSTable.Col.FREE_DISK + " bigint NOT NULL DEFAULT -1"
         );

diff --git a/.../java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoLastUsedPatch.java b/.../java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoLastUsedPatch.java
@@ -31,7 +31,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         addColumn(GeoInfoTable.TABLE_NAME,
                 GeoInfoTable.Col.LAST_USED + " bigint NOT NULL DEFAULT 0"
         );

diff --git a/...a/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoOptimizationPatch.java b/...a/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoOptimizationPatch.java
@@ -41,7 +41,7 @@ && hasColumn(tableName, Col.UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             tempOldTable();
             db.getGeoInfoTable().createTable();

diff --git a/.../src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPAnonPatch.java b/.../src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPAnonPatch.java
@@ -68,7 +68,7 @@ public Boolean processResults(ResultSet set) throws SQLException {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         Map<UUID, List<GeoInfo>> allGeoInfo = db.getGeoInfoTable().getAllGeoInfo();
         anonymizeIPs(allGeoInfo);
         groupHashedIPs();

diff --git a/.../src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPHashPatch.java b/.../src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPHashPatch.java
@@ -31,7 +31,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         addColumn(GeoInfoTable.TABLE_NAME, GeoInfoTable.Col.IP_HASH.get() + " varchar(200) DEFAULT ''");
     }
 }
diff --git a/...ava/com/djrapitops/plan/system/database/databases/sql/patches/KillsOptimizationPatch.java b/...ava/com/djrapitops/plan/system/database/databases/sql/patches/KillsOptimizationPatch.java
@@ -44,7 +44,7 @@ && hasColumn(tableName, Col.SERVER_UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             tempOldTable();
             db.getKillsTable().createTable();

diff --git a/...in/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsServerIDPatch.java b/...in/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsServerIDPatch.java
@@ -58,7 +58,7 @@ public Boolean processResults(ResultSet set) throws SQLException {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         addColumn(KillsTable.TABLE_NAME, "server_id integer NOT NULL DEFAULT 0");
 
         Map<Integer, Integer> sessionIDServerIDRelation = db.getSessionsTable().getIDServerIDRelation();

diff --git a/...java/com/djrapitops/plan/system/database/databases/sql/patches/NicknameLastSeenPatch.java b/...java/com/djrapitops/plan/system/database/databases/sql/patches/NicknameLastSeenPatch.java
@@ -41,7 +41,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         addColumn(NicknamesTable.TABLE_NAME,
                 NicknamesTable.Col.LAST_USED + " bigint NOT NULL DEFAULT '0'"
         );

diff --git a/...com/djrapitops/plan/system/database/databases/sql/patches/NicknamesOptimizationPatch.java b/...com/djrapitops/plan/system/database/databases/sql/patches/NicknamesOptimizationPatch.java
@@ -42,7 +42,7 @@ && hasColumn(tableName, Col.SERVER_UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             tempOldTable();
             db.getNicknamesTable().createTable();

diff --git a/...common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java b/...common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java
@@ -45,7 +45,21 @@ public Patch(SQLDB db) {
 
     public abstract boolean hasBeenApplied();
 
-    public abstract void apply();
+    protected abstract void applyPatch();
+
+    public void apply() {
+        if (dbType == DBType.MYSQL) disableForeignKeyChecks();
+        applyPatch();
+        if (dbType == DBType.MYSQL) enableForeignKeyChecks();
+    }
+
+    private void enableForeignKeyChecks() {
+        db.execute("SET FOREIGN_KEY_CHECKS=1");
+    }
+
+    private void disableForeignKeyChecks() {
+        db.execute("SET FOREIGN_KEY_CHECKS=0");
+    }
 
     public <T> T query(QueryStatement<T> query) {
         return db.query(query);

diff --git a/...java/com/djrapitops/plan/system/database/databases/sql/patches/PingOptimizationPatch.java b/...java/com/djrapitops/plan/system/database/databases/sql/patches/PingOptimizationPatch.java
@@ -42,7 +42,7 @@ && hasColumn(tableName, Col.SERVER_UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             tempOldTable();
             db.getPingTable().createTable();

diff --git a/...n/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionAFKTimePatch.java b/...n/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionAFKTimePatch.java
@@ -31,7 +31,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         addColumn(SessionsTable.TABLE_NAME,
                 SessionsTable.Col.AFK_TIME + " bigint NOT NULL DEFAULT 0"
         );

diff --git a/.../com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java b/.../com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java
@@ -42,7 +42,7 @@ && hasColumn(tableName, Col.SERVER_UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             dropForeignKeys(tableName);
             ensureNoForeignKeyConstraints(tableName);

diff --git a/.../com/djrapitops/plan/system/database/databases/sql/patches/TransferTableRemovalPatch.java b/.../com/djrapitops/plan/system/database/databases/sql/patches/TransferTableRemovalPatch.java
@@ -30,7 +30,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         dropTable("plan_transfer");
     }
 }
diff --git a/.../com/djrapitops/plan/system/database/databases/sql/patches/UserInfoOptimizationPatch.java b/.../com/djrapitops/plan/system/database/databases/sql/patches/UserInfoOptimizationPatch.java
@@ -42,7 +42,7 @@ && hasColumn(tableName, Col.SERVER_UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             tempOldTable();
             db.getUserInfoTable().createTable();

diff --git a/...c/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Version10Patch.java b/...c/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Version10Patch.java
@@ -37,7 +37,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             Optional<Integer> fetchedServerID = db.getServerTable().getServerID(getServerUUID());
             if (!fetchedServerID.isPresent()) {

diff --git a/...a/com/djrapitops/plan/system/database/databases/sql/patches/VersionTableRemovalPatch.java b/...a/com/djrapitops/plan/system/database/databases/sql/patches/VersionTableRemovalPatch.java
@@ -30,7 +30,7 @@ public boolean hasBeenApplied() {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         dropTable("plan_version");
     }
 }
diff --git a/...om/djrapitops/plan/system/database/databases/sql/patches/WorldTimesOptimizationPatch.java b/...om/djrapitops/plan/system/database/databases/sql/patches/WorldTimesOptimizationPatch.java
@@ -43,7 +43,7 @@ && hasColumn(tableName, Col.SERVER_UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             tempOldTable();
             db.getWorldTimesTable().createTable();

diff --git a/...ava/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesSeverIDPatch.java b/...ava/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesSeverIDPatch.java
@@ -59,7 +59,7 @@ public Boolean processResults(ResultSet set) throws SQLException {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         Map<Integer, Integer> sessionIDServerIDRelation = db.getSessionsTable().getIDServerIDRelation();
 
         String sql = "UPDATE " + WorldTimesTable.TABLE_NAME + " SET " +

diff --git a/...va/com/djrapitops/plan/system/database/databases/sql/patches/WorldsOptimizationPatch.java b/...va/com/djrapitops/plan/system/database/databases/sql/patches/WorldsOptimizationPatch.java
@@ -41,7 +41,7 @@ && hasColumn(tableName, Col.SERVER_UUID.get())
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         try {
             dropForeignKeys(tableName);
             ensureNoForeignKeyConstraints(tableName);

diff --git a/...n/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java b/...n/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java
@@ -64,7 +64,7 @@ public Boolean processResults(ResultSet set) throws SQLException {
     }
 
     @Override
-    public void apply() {
+    protected void applyPatch() {
         WorldTable worldTable = db.getWorldTable();
 
         List<UUID> serverUUIDs = db.getServerTable().getServerUUIDs();

diff --git a/.../common/src/test/java/com/djrapitops/plan/system/database/databases/sql/CommonDBTest.java b/.../common/src/test/java/com/djrapitops/plan/system/database/databases/sql/CommonDBTest.java
@@ -111,7 +111,7 @@ public boolean hasBeenApplied() {
             }
 
             @Override
-            public void apply() {
+            public void applyPatch() {
                 dropTable("plan_world_times");
                 dropTable("plan_kills");
                 dropTable("plan_sessions");