server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move DB revision struct to cpp

Browse Source 
Thanks to Olion
This commit is contained in:
Foereaper 2015-08-27 18:14:36 +02:00
parent e985297948
commit 59bc649250
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shared/Database/Database.cpp
View File

@ -35,6 +35,21 @@
#define MIN_CONNECTION_POOL_SIZE 1 #define MIN_CONNECTION_POOL_SIZE 1
#define MAX_CONNECTION_POOL_SIZE 16 #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) SqlPreparedStatement* SqlConnection::CreateStatement(const std::string& fmt)
{ {

16
src/shared/Database/Database.h
View File

@ -25,7 +25,6 @@
#ifndef DATABASE_H #ifndef DATABASE_H
#define DATABASE_H #define DATABASE_H
#include "revision.h"
#include "Threading/Threading.h" #include "Threading/Threading.h"
#include "Utilities/UnorderedMapSet.h" #include "Utilities/UnorderedMapSet.h"
#include "Database/SqlDelayThread.h" #include "Database/SqlDelayThread.h"
@ -52,21 +51,6 @@ enum DatabaseTypes
COUNT_DATABASES, 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 * @brief
* *