Split up state table dump

common/database/database_dump_service.cpp

@@ -188,12 +188,21 @@ std::string DatabaseDumpService::GetSystemTablesList()
 		tables_list += table + " ";
 	}
 
-	tables = DatabaseSchema::GetStateTables();
+	tables = DatabaseSchema::GetVersionTables();
 	for (const auto &table : tables) {
 		tables_list += table + " ";
 	}
 
-	tables = DatabaseSchema::GetVersionTables();
+	return trim(tables_list);
+}
+/**
+ * @return
+ */
+std::string DatabaseDumpService::GetStateTablesList()
+{
+	std::string tables_list;
+
+	std::vector<std::string> tables = DatabaseSchema::GetStateTables();
 	for (const auto &table : tables) {
 		tables_list += table + " ";
 	}
@@ -300,6 +309,11 @@ void DatabaseDumpService::Dump()
 			dump_descriptor += "-system";
 		}
 
+		if (IsDumpStateTables()) {
+			tables_to_dump += GetStateTablesList() + " ";
+			dump_descriptor += "-state";
+		}
+
 		if (IsDumpContentTables()) {
 			tables_to_dump += GetContentTablesList() + " ";
 			dump_descriptor += "-content";
@@ -526,3 +540,13 @@ void DatabaseDumpService::SetDumpDropTableSyntaxOnly(bool dump_drop_table_syntax
 {
 	DatabaseDumpService::dump_drop_table_syntax_only = dump_drop_table_syntax_only;
 }
+
+bool DatabaseDumpService::IsDumpStateTables() const
+{
+	return dump_state_tables;
+}
+
+void DatabaseDumpService::SetDumpStateTables(bool dump_state_tables)
+{
+	DatabaseDumpService::dump_state_tables = dump_state_tables;
+}

common/database/database_dump_service.h

@@ -51,19 +51,22 @@ public:
 	void SetDumpOutputToConsole(bool dump_output_to_console);
 	bool IsDumpDropTableSyntaxOnly() const;
 	void SetDumpDropTableSyntaxOnly(bool dump_drop_table_syntax_only);
+	bool IsDumpStateTables() const;
+	void SetDumpStateTables(bool dump_state_tables);
 
 private:
-	bool dump_all_tables             = false;
-	bool dump_system_tables          = false;
-	bool dump_content_tables         = false;
-	bool dump_player_tables          = false;
-	bool dump_query_server_tables    = false;
-	bool dump_login_server_tables    = false;
-	bool dump_with_no_data           = false;
-	bool dump_table_lock             = false;
-	bool dump_with_compression       = false;
-	bool dump_output_to_console      = false;
-	bool dump_drop_table_syntax_only = false;
+	bool        dump_all_tables             = false;
+	bool        dump_state_tables           = false;
+	bool        dump_system_tables          = false;
+	bool        dump_content_tables         = false;
+	bool        dump_player_tables          = false;
+	bool        dump_query_server_tables    = false;
+	bool        dump_login_server_tables    = false;
+	bool        dump_with_no_data           = false;
+	bool        dump_table_lock             = false;
+	bool        dump_with_compression       = false;
+	bool        dump_output_to_console      = false;
+	bool        dump_drop_table_syntax_only = false;
 	std::string dump_path;
 	std::string dump_file_name;
 
@@ -73,6 +76,7 @@ private:
 	std::string GetBaseMySQLDumpCommand();
 	std::string GetPlayerTablesList();
 	std::string GetSystemTablesList();
+	std::string GetStateTablesList();
 	std::string GetContentTablesList();
 	std::string GetLoginTableList();
 	bool IsTarAvailable();

common/database_schema.h

@@ -99,8 +99,6 @@ namespace DatabaseSchema {
 			"account_rewards",
 			"adventure_details",
 			"adventure_stats",
-			"bugs",
-			"bug_reports",
 			"buyer",
 			"char_recipe_list",
 			"character_activities",
@@ -133,7 +131,6 @@ namespace DatabaseSchema {
 			"completed_tasks",
 			"data_buckets",
 			"discovered_items",
-			"eventlog",
 			"faction_values",
 			"friends",
 			"guild_bank",
@@ -149,9 +146,9 @@ namespace DatabaseSchema {
 			"petitions",
 			"player_titlesets",
 			"quest_globals",
-			"saylink",
 			"sharedbank",
-			"reports",
+			"spell_buckets",
+			"spell_globals",
 			"timers",
 			"titles",
 			"trader",
@@ -263,6 +260,7 @@ namespace DatabaseSchema {
 	{
 		return {
 			"banned_ips",
+			"chatchannels",
 			"command_settings",
 			"db_str",
 			"eqtime",
@@ -318,7 +316,9 @@ namespace DatabaseSchema {
 	{
 		return {
 			"adventure_members",
-			"chatchannels",
+			"bugs",
+			"bug_reports",
+			"eventlog",
 			"group_id",
 			"group_leaders",
 			"item_tick",
@@ -329,8 +329,9 @@ namespace DatabaseSchema {
 			"raid_leaders",
 			"raid_members",
 			"respawn_times",
-			"spell_buckets",
-			"spell_globals",
+			"reports",
+			"saylink",
+
 		};
 	}