From 22c99005ddb1c517ad08e7673361279100b280b0 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Mon, 23 Oct 2023 16:49:59 +0200 Subject: [PATCH] Make database migrations compatible with latest CraftaroCore snapshot --- .../epicanchors/files/migration/AnchorMigration.java | 5 +---- .../epicanchors/files/migration/_1_InitialMigration.java | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/AnchorMigration.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/AnchorMigration.java index 2de69ca..4d50db1 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/AnchorMigration.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/AnchorMigration.java @@ -3,9 +3,7 @@ package com.craftaro.epicanchors.files.migration; import com.craftaro.core.configuration.Config; import com.craftaro.core.configuration.ConfigSection; import com.craftaro.core.database.DataMigration; -import com.craftaro.core.database.DatabaseConnector; import com.craftaro.epicanchors.EpicAnchors; -import com.craftaro.epicanchors.files.DataManager; import com.craftaro.epicanchors.utils.DataHelper; import com.craftaro.epicanchors.utils.ThreadSync; import org.bukkit.Location; @@ -21,13 +19,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; public class AnchorMigration extends DataMigration { - public AnchorMigration() { super(2); } @Override - public void migrate(DatabaseConnector databaseConnector, String tablePrefix) { + public void migrate(Connection connection, String tablePrefix) { Plugin plugin = EpicAnchors.getPlugin(EpicAnchors.class); long start = System.nanoTime(); diff --git a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/_1_InitialMigration.java b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/_1_InitialMigration.java index 67ba8d0..250e5fb 100644 --- a/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/_1_InitialMigration.java +++ b/EpicAnchors-Plugin/src/main/java/com/craftaro/epicanchors/files/migration/_1_InitialMigration.java @@ -1,9 +1,7 @@ package com.craftaro.epicanchors.files.migration; import com.craftaro.core.database.DataMigration; -import com.craftaro.core.database.DatabaseConnector; import com.craftaro.epicanchors.EpicAnchors; -import com.craftaro.epicanchors.files.DataManager; import java.sql.Connection; import java.sql.SQLException; @@ -15,8 +13,8 @@ public class _1_InitialMigration extends DataMigration { } @Override - public void migrate(DatabaseConnector databaseConnector, String tablePrefix) throws SQLException { - try (Statement statement = databaseConnector.getConnection().createStatement()) { + public void migrate(Connection connection, String tablePrefix) throws SQLException { + try (Statement statement = connection.createStatement()) { statement.execute("CREATE TABLE " + EpicAnchors.getPlugin(EpicAnchors.class).getDataManager().getTablePrefix() + "anchors (" + "id INTEGER NOT NULL," + "world_name TEXT NOT NULL," +