From 0048891d8852739c96dbe539042cb44563dab533 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Thu, 13 Jan 2022 23:46:07 +0100
Subject: [PATCH] Switched to the new migration setup.

---
 HEADS                             |  2 +-
 app/ccms_root.cpp                 | 12 ------------
 app/ccms_root.h                   |  1 -
 app/menu/menu_node.cpp            |  5 -----
 app/menu/menu_node.h              |  1 -
 app/page_manager/page_manager.cpp |  5 -----
 app/page_manager/page_manager.h   |  1 -
 main.cpp                          | 11 +++++++++--
 8 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/HEADS b/HEADS
index 179de85..931973c 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"master": "127219fe342c8d6cc2a10ab5ba78d9519c052105"}}
\ No newline at end of file
+{"engine": {"master": "6416ecc5e0c88115f209cd63945a29c0e16a8e99"}}
\ No newline at end of file
diff --git a/app/ccms_root.cpp b/app/ccms_root.cpp
index d131c9b..6ec0eea 100644
--- a/app/ccms_root.cpp
+++ b/app/ccms_root.cpp
@@ -102,18 +102,6 @@ void CCMSRoot::setup_middleware() {
 	// WebRoot::setup_middleware();
 }
 
-void CCMSRoot::migrate() {
-	_rbac_controller->migrate();
-	_user_controller->migrate();
-
-	if (Platform::get_singleton()->arg_parser.has_arg("-u")) {
-		printf("Creating test users.\n");
-		_user_controller->create_test_users();
-	}
-
-	_menu->migrate();
-}
-
 void CCMSRoot::compile_menu() {
 	HTMLBuilder bh;
 
diff --git a/app/ccms_root.h b/app/ccms_root.h
index b0bcdbd..c481a7e 100644
--- a/app/ccms_root.h
+++ b/app/ccms_root.h
@@ -39,7 +39,6 @@ public:
 	bool is_logged_in(Request *request);
 
 	void setup_middleware();
-	void migrate();
 
 	void compile_menu();
 
diff --git a/app/menu/menu_node.cpp b/app/menu/menu_node.cpp
index c2a00ac..979ad1e 100644
--- a/app/menu/menu_node.cpp
+++ b/app/menu/menu_node.cpp
@@ -519,11 +519,6 @@ void MenuNode::drop_table() {
 	tb->drop_table_if_exists(_table)->run_query();
 	// tb->print();
 }
-void MenuNode::migrate() {
-	drop_table();
-	create_table();
-	create_default_entries();
-}
 
 void MenuNode::create_default_entries() {
 }
diff --git a/app/menu/menu_node.h b/app/menu/menu_node.h
index c54a6cb..dade944 100644
--- a/app/menu/menu_node.h
+++ b/app/menu/menu_node.h
@@ -57,7 +57,6 @@ public:
 
 	void create_table();
 	void drop_table();
-	void migrate();
 	void create_default_entries();
 
 	void _notification(int what);
diff --git a/app/page_manager/page_manager.cpp b/app/page_manager/page_manager.cpp
index 0e03847..98368f4 100644
--- a/app/page_manager/page_manager.cpp
+++ b/app/page_manager/page_manager.cpp
@@ -383,11 +383,6 @@ void PageManager::drop_table() {
 	tb->drop_table_if_exists(_table)->run_query();
 	// tb->print();
 }
-void PageManager::migrate() {
-	drop_table();
-	create_table();
-	create_default_entries();
-}
 
 void PageManager::create_default_entries() {
 }
diff --git a/app/page_manager/page_manager.h b/app/page_manager/page_manager.h
index 6fd95d4..ff7b51d 100644
--- a/app/page_manager/page_manager.h
+++ b/app/page_manager/page_manager.h
@@ -56,7 +56,6 @@ public:
 
 	void create_table();
 	void drop_table();
-	void migrate();
 	void create_default_entries();
 
 	virtual void initialize();
diff --git a/main.cpp b/main.cpp
index 64420c4..7a7aff0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,8 +9,8 @@
 
 #include "database/db_init.h"
 
-#include "core/settings/settings.h"
 #include "core/settings/db_settings.h"
+#include "core/settings/settings.h"
 
 #include "core/http/session_manager.h"
 
@@ -78,7 +78,14 @@ int main(int argc, char **argv, char **envp) {
 
 		settings->migrate();
 		session_manager->migrate();
-		app_root->migrate();
+
+		bool seed_db = Platform::get_singleton()->arg_parser.has_arg("-s");
+
+		if (seed_db) {
+			printf("Seeding database.\n");
+		}
+
+		app_root->migrate(true, seed_db);
 	}
 
 	delete app;