mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-25 13:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Mangos Four compatible with newer MySQL. Based by work by @leprasmurf

Browse source 
* Delimite SQL queries for MySQL 8 compatibility
* Fix database name for PlayerDump
This commit is contained in:
Antz 2020-04-24 03:03:53 +01:00
parent 96e645a61d
commit fbdc248ed1
57 changed files with 1017 additions and 972 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/game/WorldHandlers/GameEventMgr.cpp
View file

@ -121,7 +121,7 @@ void GameEventMgr::StopEvent(uint16 event_id, bool overwrite)
void GameEventMgr::LoadFromDB()
{
{
QueryResult* result = WorldDatabase.Query("SELECT MAX(entry) FROM game_event");
QueryResult* result = WorldDatabase.Query("SELECT MAX(`entry`) FROM `game_event`");
if (!result)
{
sLog.outString(">> Table game_event is empty.");
@ -137,7 +137,7 @@ void GameEventMgr::LoadFromDB()
mGameEvent.resize(max_event_id + 1);
}
QueryResult* result = WorldDatabase.Query("SELECT entry,UNIX_TIMESTAMP(start_time),UNIX_TIMESTAMP(end_time),occurence,length,holiday,description FROM game_event");
QueryResult* result = WorldDatabase.Query("SELECT `entry`,UNIX_TIMESTAMP(`start_time`),UNIX_TIMESTAMP(`end_time`),`occurence`,`length`,`holiday`,`description` FROM `game_event`");
if (!result)
{
mGameEvent.clear();
@ -213,8 +213,8 @@ void GameEventMgr::LoadFromDB()
mGameEventCreatureGuids.resize(mGameEvent.size() * 2 - 1);
// 1 2
result = WorldDatabase.Query("SELECT creature.guid, game_event_creature.event "
"FROM creature JOIN game_event_creature ON creature.guid = game_event_creature.guid");
result = WorldDatabase.Query("SELECT `creature`.`guid`, `game_event_creature`.`event` "
"FROM `creature` JOIN `game_event_creature` ON `creature`.`guid` = `game_event_creature`.`guid`");
count = 0;
if (!result)
@ -291,8 +291,8 @@ void GameEventMgr::LoadFromDB()
mGameEventGameobjectGuids.resize(mGameEvent.size() * 2 - 1);
// 1 2
result = WorldDatabase.Query("SELECT gameobject.guid, game_event_gameobject.event "
"FROM gameobject JOIN game_event_gameobject ON gameobject.guid=game_event_gameobject.guid");
result = WorldDatabase.Query("SELECT `gameobject`.`guid`, `game_event_gameobject`.`event` "
"FROM `gameobject` JOIN `game_event_gameobject` ON `gameobject`.`guid`=`game_event_gameobject`.`guid`");
count = 0;
if (!result)
@ -377,12 +377,12 @@ void GameEventMgr::LoadFromDB()
mGameEventCreatureData.resize(mGameEvent.size());
// 0 1 2
result = WorldDatabase.Query("SELECT creature.guid, game_event_creature_data.event, game_event_creature_data.modelid,"
result = WorldDatabase.Query("SELECT `creature`.`guid`, `game_event_creature_data`.`event`, `game_event_creature_data`.`modelid`,"
// 3 4
"game_event_creature_data.equipment_id, game_event_creature_data.entry_id, "
"`game_event_creature_data`.`equipment_id`, `game_event_creature_data`.`entry_id`, "
// 5 6
"game_event_creature_data.spell_start, game_event_creature_data.spell_end "
"FROM creature JOIN game_event_creature_data ON creature.guid=game_event_creature_data.guid");
"`game_event_creature_data`.`spell_start`, `game_event_creature_data`.`spell_end` "
"FROM `creature` JOIN `game_event_creature_data` ON `creature`.`guid`=`game_event_creature_data`.`guid`");
count = 0;
if (!result)
@ -461,7 +461,7 @@ void GameEventMgr::LoadFromDB()
mGameEventQuests.resize(mGameEvent.size());
result = WorldDatabase.Query("SELECT quest, event FROM game_event_quest");
result = WorldDatabase.Query("SELECT `quest`, `event` FROM `game_event_quest`");
count = 0;
if (!result)
@ -520,7 +520,7 @@ void GameEventMgr::LoadFromDB()
mGameEventMails.resize(mGameEvent.size() * 2 - 1);
result = WorldDatabase.Query("SELECT event, raceMask, quest, mailTemplateId, senderEntry FROM game_event_mail");
result = WorldDatabase.Query("SELECT `event`, `raceMask`, `quest`, `mailTemplateId`, `senderEntry` FROM `game_event_mail`");
count = 0;
if (!result)
@ -604,7 +604,7 @@ uint32 GameEventMgr::Initialize() // return the next e
ActiveEvents activeAtShutdown;
if (QueryResult* result = CharacterDatabase.Query("SELECT event FROM game_event_status"))
if (QueryResult* result = CharacterDatabase.Query("SELECT `event` FROM `game_event_status`"))
{
do
{
@ -684,7 +684,7 @@ uint32 GameEventMgr::Update(ActiveEvents const* activeAtShutdown /*= NULL*/)
void GameEventMgr::UnApplyEvent(uint16 event_id)
{
m_ActiveEvents.erase(event_id);
CharacterDatabase.PExecute("DELETE FROM game_event_status WHERE event = %u", event_id);
CharacterDatabase.PExecute("DELETE FROM `game_event_status` WHERE `event` = %u", event_id);
sLog.outString("GameEvent %u \"%s\" removed.", event_id, mGameEvent[event_id].description.c_str());
// un-spawn positive event tagged objects
@ -703,7 +703,7 @@ void GameEventMgr::UnApplyEvent(uint16 event_id)
void GameEventMgr::ApplyNewEvent(uint16 event_id, bool resume)
{
m_ActiveEvents.insert(event_id);
CharacterDatabase.PExecute("INSERT INTO game_event_status (event) VALUES (%u)", event_id);
CharacterDatabase.PExecute("INSERT INTO `game_event_status` (`event`) VALUES (%u)", event_id);
if (sWorld.getConfig(CONFIG_BOOL_EVENT_ANNOUNCE))
sWorld.SendWorldText(LANG_EVENTMESSAGE, mGameEvent[event_id].description.c_str());
@ -996,12 +996,12 @@ void GameEventMgr::SendEventMails(int16 event_id)
{
// need special query
std::ostringstream ss;
ss << "SELECT characters.guid FROM characters, character_queststatus "
"WHERE (1 << (characters.race - 1)) & "
ss << "SELECT `characters`.`guid` FROM `characters`, `character_queststatus` "
"WHERE (1 << (`characters`.`race` - 1)) & "
<< itr->raceMask
<< " AND characters.deleteDate IS NULL AND character_queststatus.guid = characters.guid AND character_queststatus.quest = "
<< " AND `characters`.`deleteDate` IS NULL AND `character_queststatus`.`guid` = `characters`.`guid` AND `character_queststatus`.`quest` = "
<< itr->questId
<< " AND character_queststatus.rewarded <> 0";
<< " AND `character_queststatus`.`rewarded` <> 0";
sMassMailMgr.AddMassMailTask(new MailDraft(itr->mailTemplateId), MailSender(MAIL_CREATURE, itr->senderEntry), ss.str().c_str());
}
else