From f7a67099d45cae68964975ac7b60892fdc468d39 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 27 Jul 2019 11:45:56 +0200 Subject: Core/DBLayer: Prevent mixing databases with query holders (cherry picked from commit 13440434c34da28a5106af8419aabc8e5783faf0) # Conflicts: # src/server/game/Server/WorldSession.cpp # src/server/game/Server/WorldSession.h --- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Entities/Player/Player.h | 2 +- src/server/game/Handlers/CharacterHandler.cpp | 2 +- src/server/game/Server/WorldSession.cpp | 6 +++--- src/server/game/Server/WorldSession.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 85443e6efaa..48ce208ddea 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17121,7 +17121,7 @@ bool Player::IsLoading() const return GetSession()->PlayerLoading(); } -bool Player::LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder) +bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) { // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 //QueryResult* result = CharacterDatabase.PQuery("SELECT guid, account, name, race, class, gender, level, xp, money, skin, face, hairStyle, hairColor, facialStyle, bankSlots, restState, playerFlags, " diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index d9f0bcc5f2b..684657327fd 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1315,7 +1315,7 @@ class TC_GAME_API Player : public Unit, public GridObject /*** LOAD SYSTEM ***/ /*********************************************************/ - bool LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder); + bool LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder); bool IsLoading() const override; void Initialize(ObjectGuid::LowType guid); diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 963fc2e5477..c836979109b 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -50,7 +50,7 @@ #include "QueryHolder.h" #include "World.h" -class LoginQueryHolder : public SQLQueryHolder +class LoginQueryHolder : public CharacterDatabaseQueryHolder { private: uint32 m_accountId; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 625e2d0ea76..213e23bbd33 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -1193,7 +1193,7 @@ void WorldSession::ProcessQueryCallbacks() _queryProcessor.ProcessReadyQueries(); if (_realmAccountLoginCallback.valid() && _realmAccountLoginCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready) - InitializeSessionCallback(_realmAccountLoginCallback.get()); + InitializeSessionCallback(static_cast(_realmAccountLoginCallback.get())); //! HandlePlayerLoginOpcode if (_charLoginCallback.valid() && _charLoginCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready) @@ -1236,7 +1236,7 @@ QueryCallback WorldSession::LoadPermissionsAsync() return _RBACData->LoadFromDBAsync(); } -class AccountInfoQueryHolderPerRealm : public SQLQueryHolder +class AccountInfoQueryHolderPerRealm : public CharacterDatabaseQueryHolder { public: enum @@ -1278,7 +1278,7 @@ void WorldSession::InitializeSession() _realmAccountLoginCallback = CharacterDatabase.DelayQueryHolder(realmHolder); } -void WorldSession::InitializeSessionCallback(SQLQueryHolder* realmHolder) +void WorldSession::InitializeSessionCallback(CharacterDatabaseQueryHolder* realmHolder) { LoadAccountData(realmHolder->GetPreparedResult(AccountInfoQueryHolderPerRealm::GLOBAL_ACCOUNT_DATA), GLOBAL_CACHE_MASK); LoadTutorialsData(realmHolder->GetPreparedResult(AccountInfoQueryHolderPerRealm::TUTORIALS)); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index aa8641a02d5..5e60925a8e0 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -370,7 +370,7 @@ class TC_GAME_API WorldSession void SendClientCacheVersion(uint32 version); void InitializeSession(); - void InitializeSessionCallback(SQLQueryHolder* realmHolder); + void InitializeSessionCallback(CharacterDatabaseQueryHolder* realmHolder); rbac::RBACData* GetRBACData(); bool HasPermission(uint32 permissionId); -- cgit v1.2.3