From 0fae44cc80af5bb43dca50bf211f398e51b2b0a6 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 26 Jan 2019 12:02:30 +0200 Subject: [PATCH] Removed SQLDB#createTables --- .../java/com/djrapitops/plan/db/SQLDB.java | 12 +---- .../com/djrapitops/plan/db/CommonDBTest.java | 2 +- .../plan/db/DBPatchH2RegressionTest.java | 37 ++++++++------ .../plan/db/DBPatchMySQLRegressionTest.java | 48 ++++++++++++------- .../plan/db/DBPatchSQLiteRegressionTest.java | 37 ++++++++------ 5 files changed, 76 insertions(+), 60 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java index 3d4d775ec..29972ac23 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java @@ -213,7 +213,7 @@ public abstract class SQLDB extends AbstractDatabase { */ private void setupDatabase() throws DBInitException { try { - createTables(); + executeTransaction(new CreateTablesTransaction()); registerIndexCreationTask(); registerPatchTask(); } catch (DBOpException | IllegalArgumentException e) { @@ -244,16 +244,6 @@ public abstract class SQLDB extends AbstractDatabase { } } - /** - * Creates the tables that contain data. - *

- * Updates table columns to latest schema. - */ - @Deprecated - void createTables() throws DBInitException { - executeTransaction(new CreateTablesTransaction()); - } - public abstract void setupDataSource() throws DBInitException; @Override diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java index 0b588ea65..38d46c935 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java @@ -123,7 +123,7 @@ public abstract class CommonDBTest { dropTable("plan_users"); } }.apply(); - db.createTables(); + db.executeTransaction(new CreateTablesTransaction()); db.executeTransaction(new RemoveEverythingTransaction()); ServerTable serverTable = db.getServerTable(); serverTable.saveCurrentServerInfo(new Server(-1, serverUUID, "ServerName", "", 20)); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java index 4d91b36d3..1c74abe17 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java @@ -19,7 +19,9 @@ package com.djrapitops.plan.db; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.ServerContainer; import com.djrapitops.plan.data.store.keys.ServerKeys; +import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.RemoveEverythingTransaction; +import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.tasks.PatchTask; import com.djrapitops.plan.system.locale.Locale; import com.djrapitops.plan.system.settings.config.PlanConfig; @@ -81,22 +83,27 @@ public class DBPatchH2RegressionTest extends DBPatchRegressionTest { underTest.setupDataSource(); // Initialize database with the old table schema - underTest.execute(serverTable); - underTest.execute(usersTable); - underTest.execute(userInfoTable); - underTest.execute(geoInfoTable); - underTest.execute(nicknameTable); - underTest.execute(sessionsTable); - underTest.execute(killsTable); - underTest.execute(pingTable); - underTest.execute(commandUseTable); - underTest.execute(tpsTable); - underTest.execute(worldsTable); - underTest.execute(worldTimesTable); - underTest.execute(securityTable); - underTest.execute(transferTable); + underTest.executeTransaction(new Transaction() { + @Override + protected void performOperations() { + execute(serverTable); + execute(usersTable); + execute(userInfoTable); + execute(geoInfoTable); + execute(nicknameTable); + execute(sessionsTable); + execute(killsTable); + execute(pingTable); + execute(commandUseTable); + execute(tpsTable); + execute(worldsTable); + execute(worldTimesTable); + execute(securityTable); + execute(transferTable); + } + }); - underTest.createTables(); + underTest.executeTransaction(new CreateTablesTransaction()); insertData(underTest); } diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java index 230caf338..64c99889f 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java @@ -20,7 +20,9 @@ import com.djrapitops.plan.api.exceptions.EnableException; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.ServerContainer; import com.djrapitops.plan.data.store.keys.ServerKeys; +import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.RemoveEverythingTransaction; +import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.tasks.PatchTask; import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.locale.Locale; @@ -98,30 +100,40 @@ public class DBPatchMySQLRegressionTest extends DBPatchRegressionTest { dropAllTables(); // Initialize database with the old table schema - underTest.execute(serverTable); - underTest.execute(usersTable); - underTest.execute(userInfoTable); - underTest.execute(geoInfoTable); - underTest.execute(nicknameTable); - underTest.execute(sessionsTable); - underTest.execute(killsTable); - underTest.execute(pingTable); - underTest.execute(commandUseTable); - underTest.execute(tpsTable); - underTest.execute(worldsTable); - underTest.execute(worldTimesTable); - underTest.execute(securityTable); - underTest.execute(transferTable); + underTest.executeTransaction(new Transaction() { + @Override + protected void performOperations() { + execute(serverTable); + execute(usersTable); + execute(userInfoTable); + execute(geoInfoTable); + execute(nicknameTable); + execute(sessionsTable); + execute(killsTable); + execute(pingTable); + execute(commandUseTable); + execute(tpsTable); + execute(worldsTable); + execute(worldTimesTable); + execute(securityTable); + execute(transferTable); + } + }); - underTest.createTables(); + underTest.executeTransaction(new CreateTablesTransaction()); insertData(underTest); } private void dropAllTables() { - underTest.execute("DROP DATABASE Plan"); - underTest.execute("CREATE DATABASE Plan"); - underTest.execute("USE Plan"); + underTest.executeTransaction(new Transaction() { + @Override + protected void performOperations() { + execute("DROP DATABASE Plan"); + execute("CREATE DATABASE Plan"); + execute("USE Plan"); + } + }); } @After diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java index 5ef2046b5..750196c73 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java @@ -19,7 +19,9 @@ package com.djrapitops.plan.db; import com.djrapitops.plan.api.exceptions.database.DBInitException; import com.djrapitops.plan.data.store.containers.ServerContainer; import com.djrapitops.plan.data.store.keys.ServerKeys; +import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction; import com.djrapitops.plan.db.access.transactions.RemoveEverythingTransaction; +import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.tasks.PatchTask; import com.djrapitops.plan.system.locale.Locale; import com.djrapitops.plugin.logging.L; @@ -74,22 +76,27 @@ public class DBPatchSQLiteRegressionTest extends DBPatchRegressionTest { underTest.setupDataSource(); // Initialize database with the old table schema - underTest.execute(serverTable); - underTest.execute(usersTable); - underTest.execute(userInfoTable); - underTest.execute(geoInfoTable); - underTest.execute(nicknameTable); - underTest.execute(sessionsTable); - underTest.execute(killsTable); - underTest.execute(pingTable); - underTest.execute(commandUseTable); - underTest.execute(tpsTable); - underTest.execute(worldsTable); - underTest.execute(worldTimesTable); - underTest.execute(securityTable); - underTest.execute(transferTable); + underTest.executeTransaction(new Transaction() { + @Override + protected void performOperations() { + execute(serverTable); + execute(usersTable); + execute(userInfoTable); + execute(geoInfoTable); + execute(nicknameTable); + execute(sessionsTable); + execute(killsTable); + execute(pingTable); + execute(commandUseTable); + execute(tpsTable); + execute(worldsTable); + execute(worldTimesTable); + execute(securityTable); + execute(transferTable); + } + }); - underTest.createTables(); + underTest.executeTransaction(new CreateTablesTransaction()); insertData(underTest); }