diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index 44fc1c8f..c3e86d01 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -35,6 +35,21 @@ #define MIN_CONNECTION_POOL_SIZE 1 #define MAX_CONNECTION_POOL_SIZE 16 +struct DBVersion +{ + std::string dbname; + uint32 expected_version; + uint32 expected_structure; + uint32 expected_content; + std::string description; +}; + +const DBVersion databaseVersions[COUNT_DATABASES] = { + { "World", WORLD_DB_VERSION_NR, WORLD_DB_STRUCTURE_NR, WORLD_DB_CONTENT_NR, WORLD_DB_UPDATE_DESCRIPTION }, // DATABASE_WORLD + { "Realmd", REALMD_DB_VERSION_NR, REALMD_DB_STRUCTURE_NR, REALMD_DB_CONTENT_NR, WORLD_DB_UPDATE_DESCRIPTION }, // DATABASE_REALMD + { "Character", CHAR_DB_VERSION_NR, CHAR_DB_STRUCTURE_NR, CHAR_DB_CONTENT_NR, WORLD_DB_UPDATE_DESCRIPTION }, // DATABASE_CHARACTER +}; + ////////////////////////////////////////////////////////////////////////// SqlPreparedStatement* SqlConnection::CreateStatement(const std::string& fmt) { diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index 29d440ba..909ddac7 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -25,7 +25,6 @@ #ifndef DATABASE_H #define DATABASE_H -#include "revision.h" #include "Threading/Threading.h" #include "Utilities/UnorderedMapSet.h" #include "Database/SqlDelayThread.h" @@ -52,21 +51,6 @@ enum DatabaseTypes COUNT_DATABASES, }; -struct DBVersion -{ - std::string dbname; - uint32 expected_version; - uint32 expected_structure; - uint32 expected_content; - std::string description; -}; - -const DBVersion databaseVersions[COUNT_DATABASES] = { - { "World", WORLD_DB_VERSION_NR, WORLD_DB_STRUCTURE_NR, WORLD_DB_CONTENT_NR, WORLD_DB_UPDATE_DESCRIPTION }, // DATABASE_WORLD - { "Realmd", REALMD_DB_VERSION_NR, REALMD_DB_STRUCTURE_NR, REALMD_DB_CONTENT_NR, WORLD_DB_UPDATE_DESCRIPTION }, // DATABASE_REALMD - { "Character", CHAR_DB_VERSION_NR, CHAR_DB_STRUCTURE_NR, CHAR_DB_CONTENT_NR, WORLD_DB_UPDATE_DESCRIPTION }, // DATABASE_CHARACTER -}; - /** * @brief *