Resolve "Flyway migrations"
This commit is contained in:
1 parent
fae59dd9bb
commit
41d6de7219
11 files changed
+132
-78
No files matched your search
@@ -9,6 +9,7 @@ package me.bobert.netneutrality;
|
||||
import io.sentry.Sentry;
|
||||
import me.bobert.netneutrality.core.LogHandler;
|
||||
import me.bobert.netneutrality.core.command.CommandManager;
|
||||
import me.bobert.netneutrality.core.db.DatabaseMigration;
|
||||
import me.bobert.netneutrality.core.db.SessionManager;
|
||||
import me.bobert.netneutrality.core.tasks.TaskManager;
|
||||
import me.bobert.netneutrality.core.thread.ThreadManager;
|
||||
@@ -67,7 +68,7 @@ public class NetNeutrality {
|
||||
throw new RuntimeException("No bot token provided, exiting.");
|
||||
}
|
||||
|
||||
// DatabaseMigration.migrate();
|
||||
DatabaseMigration.migrate();
|
||||
SessionManager.getSessionFactory();
|
||||
CommandManager.init();
|
||||
MusicManager.initPlayerManager();
|
||||
|
||||
@@ -18,11 +18,11 @@ public class DatabaseMigration {
|
||||
String dbUser = Settings.getInstance().get("MYSQL_USER", "root");
|
||||
String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", "");
|
||||
String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost");
|
||||
String dbUrl = String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName);
|
||||
|
||||
try {
|
||||
Flyway flyway = Flyway.configure()
|
||||
.dataSource(String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName), dbUser, dbPass)
|
||||
.baselineOnMigrate(true)
|
||||
.dataSource(dbUrl, dbUser, dbPass)
|
||||
.load();
|
||||
|
||||
flyway.migrate();
|
||||
|
||||
@@ -33,7 +33,7 @@ public class SessionManager {
|
||||
String dbUser = Settings.getInstance().get("MYSQL_USER", "root");
|
||||
String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", "");
|
||||
String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost");
|
||||
logger.info(String.format("Connecting to database '%s' at %s:3306 with user '%s'", dbName, dbHost, dbUser));
|
||||
logger.info("Connecting to database '{}' at {}:3306 with user '{}'", dbName, dbHost, dbUser);
|
||||
|
||||
settings.put(Environment.JAKARTA_JDBC_URL, String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName));
|
||||
settings.put(Environment.JAKARTA_JDBC_USER, dbUser);
|
||||
|
||||
Reference in new issue
Block a user