Resolve "Flyway migrations"
This commit is contained in:
anthorob committed
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);
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
--
|
||||
-- Database: `netneutrality`
|
||||
--
|
||||
CREATE DATABASE IF NOT EXISTS `netneutrality` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `blacklist`
|
||||
--
|
||||
CREATE TABLE `blacklist` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`guild_id` varchar(255) NOT NULL,
|
||||
`word` varchar(255) NOT NULL,
|
||||
`enabled` tinyint(1) NOT NULL,
|
||||
`creator_id` varchar(255) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `fk_blacklist_guilds` (`guild_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `guilds`
|
||||
--
|
||||
CREATE TABLE `guilds` (
|
||||
`guild_id` varchar(255) NOT NULL,
|
||||
`logging` tinyint(1) NOT NULL DEFAULT 0,
|
||||
`debug` tinyint(1) NOT NULL DEFAULT 1,
|
||||
`log_channel` varchar(255) DEFAULT NULL,
|
||||
PRIMARY KEY (`guild_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `guild_settings`
|
||||
--
|
||||
CREATE TABLE `guild_settings` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`guild_id` varchar(255) NOT NULL,
|
||||
`name` varchar(255) NOT NULL,
|
||||
`value` text NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `fk_guildsetting_guilds` (`guild_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `logging`
|
||||
--
|
||||
CREATE TABLE `logging` (
|
||||
`guild_id` varchar(255) NOT NULL,
|
||||
`channel_id` varchar(255) NOT NULL,
|
||||
`enabled` tinyint(1) NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`guild_id`,`channel_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `log_message`
|
||||
--
|
||||
CREATE TABLE `log_message` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`guild_id` varchar(255) NOT NULL,
|
||||
`channel_id` varchar(255) NOT NULL,
|
||||
`message_id` varchar(255) NOT NULL,
|
||||
`user_id` varchar(255) NOT NULL,
|
||||
`date_sent` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
|
||||
`message` varchar(2000) DEFAULT NULL,
|
||||
`edited_message` varchar(2000) DEFAULT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `message_id` (`message_id`),
|
||||
KEY `fk_log_guilds` (`guild_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `tasks`
|
||||
--
|
||||
CREATE TABLE `tasks` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`task_id` varchar(255) NOT NULL,
|
||||
`task_class` varchar(255) NOT NULL,
|
||||
`payload` text DEFAULT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `tasks_unique_taskid` (`task_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `web_users`
|
||||
--
|
||||
CREATE TABLE `web_users` (
|
||||
`id` varchar(255) NOT NULL,
|
||||
`email` mediumtext NOT NULL,
|
||||
`token` varchar(255) NOT NULL,
|
||||
`expires` timestamp NOT NULL DEFAULT current_timestamp(),
|
||||
`refresh_token` varchar(255) NOT NULL,
|
||||
`remember_token` varchar(100) DEFAULT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
|
||||
--
|
||||
-- Constraints for table `blacklist`
|
||||
--
|
||||
ALTER TABLE `blacklist`
|
||||
ADD CONSTRAINT `fk_blacklist_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
|
||||
--
|
||||
-- Constraints for table `guild_settings`
|
||||
--
|
||||
ALTER TABLE `guild_settings`
|
||||
ADD CONSTRAINT `fk_guildsetting_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
|
||||
--
|
||||
-- Constraints for table `logging`
|
||||
--
|
||||
ALTER TABLE `logging`
|
||||
ADD CONSTRAINT `fk_logging_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
|
||||
--
|
||||
-- Constraints for table `log_message`
|
||||
--
|
||||
ALTER TABLE `log_message`
|
||||
ADD CONSTRAINT `fk_log_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
Reference in new issue
Block a user