From 4695aa30adaae49b1d36f32200bb6227ec800b88 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 23 Dec 2019 04:11:45 -0600 Subject: [PATCH] Add more DatabaseSchema entries --- common/database_schema.h | 92 +++++++++++++++++++++++++- world/world_server_command_handler.cpp | 21 ++++++ 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/common/database_schema.h b/common/database_schema.h index 98cc98a5b..b60f82162 100644 --- a/common/database_schema.h +++ b/common/database_schema.h @@ -33,7 +33,13 @@ namespace DatabaseSchema { static std::vector GetPlayerTables() { std::vector tables = { + "account", + "account_ip", + "account_flags", + "account_rewards", + "adventure_details", "adventure_stats", + "buyer", "char_recipe_list", "character_activities", "character_alt_currency", @@ -55,15 +61,21 @@ namespace DatabaseSchema { "character_material", "character_memmed_spells", "character_pet_buffs", + "character_pet_info", "character_pet_inventory", "character_potionbelt", "character_skills", "character_spells", + "character_tasks", "character_tribute", "completed_tasks", "faction_values", "friends", + "guild_bank", "guild_members", + "guild_ranks", + "guild_relations", + "guilds", "instance_list_player", "inventory", "inventory_snapshots", @@ -71,8 +83,11 @@ namespace DatabaseSchema { "mail", "player_titlesets", "quest_globals", + "sharedbank", "timers", "titles", + "trader", + "trader_audit", "zone_flags" }; @@ -185,15 +200,90 @@ namespace DatabaseSchema { static std::vector GetServerTables() { std::vector tables = { + "bugs", "bug_reports", + "command_settings", "db_str", + "discovered_items", "eqtime", + "eventlog", + "gm_ips", + "hackers", + "ip_exemptions", + "launcher", + "launcher_zones", "level_exp_mods", "logsys_categories", "name_filter", "perl_event_export_settings", + "petitions", "profanity_list", - "saylink" + "reports", + "rule_sets", + "rule_values", + "saylink", + "variables", + }; + + return tables; + } + + /** + * Gets state tables + * Tables that keep track of server state + * + * @return + */ + static std::vector GetStateTables() + { + std::vector tables = { + "adventure_members", + "chatchannels", + "group_id", + "group_leaders", + "item_tick", + "lfguild", + "merchantlist_temp", + "object_contents", + "raid_details", + "raid_leaders", + "raid_members", + "respawn_times", + "spell_buckets", + "spell_globals", + }; + + return tables; + } + + /** + * Gets login tables + * + * @return + */ + static std::vector GetLoginTables() + { + std::vector tables = { + "login_accounts", + "login_api_tokens", + "login_server_admins", + "login_server_list_types", + "login_world_servers", + }; + + return tables; + } + + /** + * Gets login tables + * + * @return + */ + static std::vector GetVersionTables() + { + std::vector tables = { + "db_version", + "inventory_versions", }; return tables; diff --git a/world/world_server_command_handler.cpp b/world/world_server_command_handler.cpp index 7efbc1f31..286ab50ad 100644 --- a/world/world_server_command_handler.cpp +++ b/world/world_server_command_handler.cpp @@ -167,11 +167,32 @@ namespace WorldserverCommandHandler { server_tables_json.append(table); } + Json::Value login_tables_json; + std::vector login_tables = DatabaseSchema::GetLoginTables(); + for (const auto &table : login_tables) { + login_tables_json.append(table); + } + + Json::Value state_tables_json; + std::vector state_tables = DatabaseSchema::GetStateTables(); + for (const auto &table : state_tables) { + state_tables_json.append(table); + } + + Json::Value version_tables_json; + std::vector version_tables = DatabaseSchema::GetVersionTables(); + for (const auto &table : version_tables) { + version_tables_json.append(table); + } + Json::Value schema; schema["server_tables"] = server_tables_json; schema["player_tables"] = player_tables_json; schema["content_tables"] = content_tables_json; + schema["login_tables"] = login_tables_json; + schema["state_tables"] = state_tables_json; + schema["version_tables"] = version_tables_json; std::stringstream payload; payload << schema;