Handle table creations via MigrationManager

An entry to the migrations table must be added to keep track of the table's version.
Fixes "premium" table creation on new databases.

Author: Smart123s

core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java

@@ -254,7 +254,6 @@ public boolean setupDatabase() {
 
         try {
             storage.createTables();
-            storage.migrateTable();
             return true;
         } catch (Exception ex) {
             plugin.getLog().warn("Failed to setup database. Disabling plugin...", ex);

core/src/main/java/com/github/games647/fastlogin/core/storage/MigratableStorage.java

@@ -25,6 +25,8 @@
  */
 package com.github.games647.fastlogin.core.storage;
 
+import java.sql.SQLException;
+
 public interface MigratableStorage {
 
     /**
@@ -34,4 +36,6 @@ public interface MigratableStorage {
 
     String getTableName();
 
+    void createTable() throws SQLException;
+
 }

core/src/main/java/com/github/games647/fastlogin/core/storage/MigrationManager.java

@@ -69,7 +69,7 @@ protected MigrationManager(FastLoginCore<?, ?, ?> core, SQLStorage storage) {
         this.storage = storage;
     }
 
-    protected void createTables() throws SQLException {
+    private void createMigrationTable() throws SQLException {
         try (Connection con = storage.getDataSource().getConnection();
                 Statement createStmt = con.createStatement()) {
 
@@ -84,6 +84,29 @@ protected void createTables() throws SQLException {
         }
     }
 
+    /**
+     * Initialize tables if they don't exist yet
+     * @throws SQLException
+     */
+    protected void createTables() throws SQLException {
+        createMigrationTable();
+        createTable(storage.getAuthStorage());
+    }
+
+    /**
+     * Create a new table in the database, and add an entry about it to MigrationManager
+     * @param table the table to be created
+     * @throws SQLException
+     */
+    private void createTable(MigratableStorage table) throws SQLException {
+        if (!tableExists(table)) {
+            table.createTable();
+            try (Connection con = storage.getDataSource().getConnection()) {
+                insertMigration(con, table, table.getRequiredVersion());
+            }
+        }
+    }
+
     /**
      * Check the current version of a table stored in the connected database
      * @param table the table to check
@@ -106,7 +129,7 @@ protected int getCurrentTableVersion(MigratableStorage table) {
         }
 
         // special case: table premium was created before the migration manager
-        if (version == 0 && "premium".equals(table.getTableName()) && tableExists(table)) {
+        if (version == 0 && "premium".equals(table.getTableName())) {
             version = 1;
         }
 
@@ -119,18 +142,13 @@ protected void migrateTable(MigratableStorage table) {
         for (int i = initialVersion; i < table.getRequiredVersion(); i++) {
             core.getPlugin().getLog().info("Starting database migration of table {} to version {}",
                     table.getTableName(), i + 1);
-            try (Connection con = storage.getDataSource().getConnection();
-                    PreparedStatement saveStmt = con.prepareStatement(INSERT_MIGRATION)) {
+            try (Connection con = storage.getDataSource().getConnection()) {
                 for (String statement : getMigrationStatement(table, i)) {
                     try (Statement migrateStmt = con.createStatement()) {
                         migrateStmt.executeUpdate(statement);
                     }
+                    insertMigration(con, table, i + 1);
                 }
-
-                // add entry to migrations table
-                saveStmt.setString(1, table.getTableName());
-                saveStmt.setInt(2, i + 1);
-                saveStmt.executeUpdate();
             } catch (SQLException sqlEx) {
                 core.getPlugin().getLog().error("Failed to migrate table {} to version {}",
                         table.getTableName(), i + 1, sqlEx);
@@ -141,6 +159,22 @@ protected void migrateTable(MigratableStorage table) {
         }
     }
 
+    /**
+     * Add an entry to migrations table
+     * @param con an open connection that was used to execute the migration statements
+     * @param table the table that was migrated
+     * @param newVersion the version the table was migrated to
+     */
+    private void insertMigration(Connection con, MigratableStorage table, int newVersion) {
+        try (PreparedStatement saveStmt = con.prepareStatement(INSERT_MIGRATION)) {
+            saveStmt.setString(1, table.getTableName());
+            saveStmt.setInt(2, newVersion);
+            saveStmt.executeUpdate();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * Get an SQL statement to migrate the table to the next version
      * @param table the database table to be migrated

core/src/main/java/com/github/games647/fastlogin/core/storage/SQLAuthStorage.java

@@ -76,7 +76,7 @@ public SQLAuthStorage(FastLoginCore<?, ?, ?> core, SQLStorage storage) {
         this.storage = storage;
     }
 
-    protected void createTables() throws SQLException {
+    public void createTable() throws SQLException {
         try (Connection con = storage.getDataSource().getConnection();
                 Statement createStmt = con.createStatement()) {
 

core/src/main/java/com/github/games647/fastlogin/core/storage/SQLStorage.java

@@ -62,10 +62,6 @@ public SQLStorage(FastLoginCore<?, ?, ?> core, HikariConfig config) {
 
     public void createTables() throws SQLException {
         migrationManager.createTables();
-        authStorage.createTables();
-    }
-
-    public void migrateTable() {
         migrationManager.migrateTable(authStorage);
     }