From ec09a56a02958bfd4bbd208a16cd44c2b328eeb2 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Wed, 13 Sep 2023 13:51:40 +0200 Subject: [PATCH] Update migrations --- .../database/migrations/_1_InitialMigration.java | 8 ++++---- .../database/migrations/_2_EntityStacks.java | 9 ++++----- .../database/migrations/_3_BlockStacks.java | 8 ++++---- .../database/migrations/_6_RemoveStackedEntityTable.java | 5 +++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java index 858adf5..4d71a16 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java @@ -4,6 +4,7 @@ import com.craftaro.core.database.DataMigration; import com.craftaro.core.database.DatabaseConnector; import com.craftaro.core.database.MySQLConnector; +import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; @@ -14,13 +15,12 @@ public class _1_InitialMigration extends DataMigration { } @Override - public void migrate(DatabaseConnector connector, String tablePrefix) throws SQLException { - String autoIncrement = connector instanceof MySQLConnector ? " AUTO_INCREMENT" : ""; + public void migrate(Connection connection, String tablePrefix) throws SQLException { // Create spawners table - try (Statement statement = connector.getConnection().createStatement()) { + try (Statement statement = connection.createStatement()) { statement.execute("CREATE TABLE IF NOT EXISTS " + tablePrefix + "spawners (" + - "id INTEGER PRIMARY KEY" + autoIncrement + ", " + + "id INTEGER PRIMARY KEY AUTO_INCREMENT, " + "amount INTEGER NOT NULL," + "world TEXT NOT NULL, " + "x DOUBLE NOT NULL, " + diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java index 1b9c9c0..4d3a463 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java @@ -4,6 +4,7 @@ import com.craftaro.core.database.DataMigration; import com.craftaro.core.database.DatabaseConnector; import com.craftaro.core.database.MySQLConnector; +import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; @@ -14,13 +15,11 @@ public class _2_EntityStacks extends DataMigration { } @Override - public void migrate(DatabaseConnector connector, String tablePrefix) throws SQLException { - String autoIncrement = connector instanceof MySQLConnector ? " AUTO_INCREMENT" : ""; - + public void migrate(Connection connection, String tablePrefix) throws SQLException { // Create host entities table - try (Statement statement = connector.getConnection().createStatement()) { + try (Statement statement = connection.createStatement()) { statement.execute("CREATE TABLE IF NOT EXISTS " + tablePrefix + "host_entities (" + - "id INTEGER PRIMARY KEY" + autoIncrement + ", " + + "id INTEGER PRIMARY KEY AUTO_INCREMENT, " + "uuid VARCHAR(36) NOT NULL," + "create_duplicates INTEGER NOT NULL DEFAULT 0" + ")"); diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java index 9c3501c..93137b7 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java @@ -4,6 +4,7 @@ import com.craftaro.core.database.DataMigration; import com.craftaro.core.database.DatabaseConnector; import com.craftaro.core.database.MySQLConnector; +import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; @@ -14,13 +15,12 @@ public class _3_BlockStacks extends DataMigration { } @Override - public void migrate(DatabaseConnector connector, String tablePrefix) throws SQLException { - String autoIncrement = connector instanceof MySQLConnector ? " AUTO_INCREMENT" : ""; + public void migrate(Connection connection, String tablePrefix) throws SQLException { // Create blocks table - try (Statement statement = connector.getConnection().createStatement()) { + try (Statement statement = connection.createStatement()) { statement.execute("CREATE TABLE IF NOT EXISTS " + tablePrefix + "blocks (" + - "id INTEGER PRIMARY KEY" + autoIncrement + ", " + + "id INTEGER PRIMARY KEY AUTO_INCREMENT, " + "amount INTEGER NOT NULL," + "material TEXT NOT NULL," + "world TEXT NOT NULL, " + diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_6_RemoveStackedEntityTable.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_6_RemoveStackedEntityTable.java index 2813e31..1dcc2a3 100644 --- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_6_RemoveStackedEntityTable.java +++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/database/migrations/_6_RemoveStackedEntityTable.java @@ -3,6 +3,7 @@ package com.craftaro.ultimatestacker.database.migrations; import com.craftaro.core.database.DataMigration; import com.craftaro.core.database.DatabaseConnector; +import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; @@ -13,8 +14,8 @@ public class _6_RemoveStackedEntityTable extends DataMigration { } @Override - public void migrate(DatabaseConnector connector, String tablePrefix) { - try (Statement statement = connector.getConnection().createStatement()) { + public void migrate(Connection connection, String tablePrefix) { + try (Statement statement = connection.createStatement()) { statement.execute("DROP TABLE IF EXISTS " + tablePrefix + "stacked_entities"); } catch (SQLException e) { e.printStackTrace();