Upstream
/
UltimateKits
mirror of https://github.com/songoda/UltimateKits.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix database implementation to be compatible with latest CraftaroCore

This commit is contained in:
Christian Koop 2023-08-16 11:16:34 +02:00
parent 49a0a518f4
commit f8ee4fd6ad
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/craftaro/ultimatekits/database/migrations/_1_InitialMigration.java
View File

@ -1,21 +1,19 @@
package com.craftaro.ultimatekits.database.migrations; package com.craftaro.ultimatekits.database.migrations;
import com.craftaro.core.database.DataMigration; import com.craftaro.core.database.DataMigration;
import com.craftaro.core.database.DatabaseConnector;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
public class _1_InitialMigration extends DataMigration { public class _1_InitialMigration extends DataMigration {
public _1_InitialMigration() { public _1_InitialMigration() {
super(1); super(1);
} }
@Override @Override
public void migrate(DatabaseConnector databaseConnector, String tablePrefix) throws SQLException { public void migrate(Connection connection, String tablePrefix) throws SQLException {
try (Statement statement = databaseConnector.getConnection().createStatement()) { try (Statement statement = connection.createStatement()) {
statement.execute("CREATE TABLE " + tablePrefix + "blockdata (" + statement.execute("CREATE TABLE " + tablePrefix + "blockdata (" +
"type TEXT NOT NULL," + "type TEXT NOT NULL," +
"kit TEXT NOT NULL," + "kit TEXT NOT NULL," +
@ -30,4 +28,4 @@ public class _1_InitialMigration extends DataMigration {
")"); ")");
} }
} }
} }

9
src/main/java/com/craftaro/ultimatekits/database/migrations/_2_DuplicateMigration.java
View File

@ -1,8 +1,6 @@
package com.craftaro.ultimatekits.database.migrations; package com.craftaro.ultimatekits.database.migrations;
import com.craftaro.core.database.DataMigration; import com.craftaro.core.database.DataMigration;
import com.craftaro.core.database.DatabaseConnector;
import com.craftaro.core.database.SQLiteConnector; import com.craftaro.core.database.SQLiteConnector;
import java.sql.Connection; import java.sql.Connection;
@ -13,17 +11,14 @@ import java.sql.Statement;
import java.util.HashMap; import java.util.HashMap;
public class _2_DuplicateMigration extends DataMigration { public class _2_DuplicateMigration extends DataMigration {
public _2_DuplicateMigration() { public _2_DuplicateMigration() {
super(2); super(2);
} }
@Override @Override
public void migrate(DatabaseConnector databaseConnector, String tablePrefix) throws SQLException { public void migrate(Connection connection, String tablePrefix) throws SQLException {
// Fix duplicate data caused by old sqlite data duplication bug // Fix duplicate data caused by old sqlite data duplication bug
Connection connection = databaseConnector.getConnection(); boolean sqlite = connection instanceof SQLiteConnector;
boolean sqlite = databaseConnector instanceof SQLiteConnector;
if (sqlite) { if (sqlite) {
HashMap<String, TempKitData> data = new HashMap(); HashMap<String, TempKitData> data = new HashMap();
// grab a copy of the unique data values // grab a copy of the unique data values