diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index 8d6d49061..0d27800ad 100644 --- a/src/game/AccountMgr.cpp +++ b/src/game/AccountMgr.cpp @@ -56,22 +56,22 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass return AOR_NAME_ALREDY_EXIST; // username does already exist } - if (!LoginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str())) + if (!LoginDatabase.PExecute("INSERT INTO `account` (`username`, `sha_pass_hash`, `joindate`) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str())) return AOR_DB_INTERNAL_ERROR; // unexpected error - LoginDatabase.Execute("INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist,account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL"); + LoginDatabase.Execute("INSERT INTO `realmcharacters` (`realmid`, `acctid`, `numchars`) SELECT `realmlist`.`id`, `account`.`id`, 0 FROM `realmlist`,`account` LEFT JOIN `realmcharacters` ON `acctid`=`account`.`id` WHERE `acctid` IS NULL"); return AOR_OK; // everything's fine } AccountOpResult AccountMgr::DeleteAccount(uint32 accid) { - QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u'", accid); + QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM `account` WHERE `id`='%u'", accid); if (!result) return AOR_NAME_NOT_EXIST; // account doesn't exist delete result; // existing characters list - result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%u'", accid); + result = CharacterDatabase.PQuery("SELECT `guid` FROM `characters` WHERE `account`='%u'", accid); if (result) { do @@ -90,13 +90,13 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid) } // table realm specific but common for all characters of account for realm - CharacterDatabase.PExecute("DELETE FROM character_tutorial WHERE account = '%u'", accid); + CharacterDatabase.PExecute("DELETE FROM `character_tutorial` WHERE `account` = '%u'", accid); LoginDatabase.BeginTransaction(); bool res = - LoginDatabase.PExecute("DELETE FROM account WHERE id='%u'", accid) && - LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid='%u'", accid); + LoginDatabase.PExecute("DELETE FROM `account` WHERE `id`='%u'", accid) && + LoginDatabase.PExecute("DELETE FROM `realmcharacters` WHERE `acctid`='%u'", accid); LoginDatabase.CommitTransaction(); @@ -109,7 +109,7 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid) //#DEPRECATED: Not used anywhere, should we delete? AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname, std::string new_passwd) { - QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u'", accid); + QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM `account` WHERE `id`='%u'", accid); if (!result) return AOR_NAME_NOT_EXIST; // account doesn't exist delete result; @@ -126,7 +126,7 @@ AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname, std::string safe_new_uname = new_uname; LoginDatabase.escape_string(safe_new_uname); - if (!LoginDatabase.PExecute("UPDATE account SET v='0',s='0',username='%s',sha_pass_hash='%s' WHERE id='%u'", safe_new_uname.c_str(), + if (!LoginDatabase.PExecute("UPDATE `account` SET `v`='0', `s`='0', `username`='%s', `sha_pass_hash`='%s' WHERE `id`='%u'", safe_new_uname.c_str(), CalculateShaPassHash(new_uname, new_passwd).c_str(), accid)) return AOR_DB_INTERNAL_ERROR; // unexpected error @@ -149,7 +149,7 @@ AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd, normalizeString(new_passwd); // also reset s and v to force update at next realmd login - if (!LoginDatabase.PExecute("UPDATE account SET v='0', s='0', sha_pass_hash='%s' WHERE id='%u'", + if (!LoginDatabase.PExecute("UPDATE `account` SET `v`='0', `s`='0', `sha_pass_hash`='%s' WHERE `id`='%u'", CalculateShaPassHash(username, new_passwd).c_str(), accid)) return AOR_DB_INTERNAL_ERROR; // unexpected error @@ -159,7 +159,7 @@ AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd, uint32 AccountMgr::GetId(std::string username) { LoginDatabase.escape_string(username); - QueryResult* result = LoginDatabase.PQuery("SELECT id FROM account WHERE username = '%s'", username.c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT `id` FROM `account` WHERE `username` = '%s'", username.c_str()); if (!result) return 0; else @@ -230,13 +230,13 @@ AccountTypes AccountMgr::GetSecurity(uint32 acc_id) void AccountMgr::SetSecurity(uint32 accId, AccountTypes sec) { m_accountSecurity[accId] = sec; - LoginDatabase.PExecute("DELETE FROM account_access WHERE RealmID=%u AND id=%u", realmID, accId); - LoginDatabase.PExecute("INSERT INTO account_access SET RealmID=%u, id=%u, gmlevel=%u", realmID, accId, sec); + LoginDatabase.PExecute("DELETE FROM `account_access` WHERE `RealmID`=%u AND `id`=%u", realmID, accId); + LoginDatabase.PExecute("INSERT INTO `account_access` SET `RealmID`=%u, `id`=%u, `gmlevel`=%u", realmID, accId, sec); } bool AccountMgr::GetName(uint32 acc_id, std::string &name) { - QueryResult* result = LoginDatabase.PQuery("SELECT username FROM account WHERE id = '%u'", acc_id); + QueryResult* result = LoginDatabase.PQuery("SELECT `username` FROM `account` WHERE `id` = '%u'", acc_id); if (result) { name = (*result)[0].GetCppString(); @@ -251,7 +251,7 @@ bool AccountMgr::GetName(uint32 acc_id, std::string &name) uint32 AccountMgr::GetCharactersCount(uint32 acc_id) { // check character count - QueryResult* result = CharacterDatabase.PQuery("SELECT COUNT(guid) FROM characters WHERE account = '%u'", acc_id); + QueryResult* result = CharacterDatabase.PQuery("SELECT COUNT(`guid`) FROM `characters` WHERE `account` = '%u'", acc_id); if (result) { Field* fields = result->Fetch(); @@ -275,7 +275,7 @@ bool AccountMgr::CheckPassword(uint32 accid, std::string passwd, std::string use normalizeString(passwd); - QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM account WHERE id='%u' AND sha_pass_hash='%s'", accid, CalculateShaPassHash(username, passwd).c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT 1 FROM `account` WHERE `id`='%u' AND `sha_pass_hash`='%s'", accid, CalculateShaPassHash(username, passwd).c_str()); if (result) { delete result; diff --git a/src/game/Commands/AccountCommands.cpp b/src/game/Commands/AccountCommands.cpp index 69c1b14c7..40796acea 100644 --- a/src/game/Commands/AccountCommands.cpp +++ b/src/game/Commands/AccountCommands.cpp @@ -64,7 +64,7 @@ bool ChatHandler::HandleAccountSetAddonCommand(char* args) return false; // No SQL injection - LoginDatabase.PExecute("UPDATE account SET expansion = '%u' WHERE id = '%u'", lev, account_id); + LoginDatabase.PExecute("UPDATE `account` SET `expansion` = '%u' WHERE `id` = '%u'", lev, account_id); PSendSysMessage(LANG_ACCOUNT_SETADDON, account_name.c_str(), account_id, lev); return true; } @@ -197,7 +197,7 @@ bool ChatHandler::HandleAccountSetLockedCommand(char* args) if (value < 16) { - LoginDatabase.PExecute("UPDATE account SET locked = '%u' WHERE id = '%u'", value, account_id); + LoginDatabase.PExecute("UPDATE `account` SET `locked` = '%u' WHERE `id` = '%u'", value, account_id); PSendSysMessage(LANG_SET_LOCK_SUCCESS, account_name.c_str(), account_id, value); } else @@ -222,7 +222,7 @@ bool ChatHandler::HandleAccountCharactersCommand(char* args) ///- Get the characters for account id CharacterDatabase.AsyncPQuery(&PlayerSearchHandler::HandlePlayerCharacterLookupResult, GetAccountId(), 100u, - "SELECT guid, name, race, class, level FROM characters WHERE account = %u", + "SELECT `guid`, `name`, `race`, `class`, `level` FROM `characters` WHERE `account` = %u", account_id); return true; @@ -317,8 +317,8 @@ bool ChatHandler::HandleAccountOnlineListCommand(char* args) return false; ///- Get the list of accounts ID logged to the realm - // 0 1 2 3 4 - QueryResult* result = LoginDatabase.PQuery("SELECT id, username, last_ip, gmlevel, expansion FROM account WHERE current_realm = %u LIMIT %u", realmID, limit); + // 0 1 2 3 4 + QueryResult* result = LoginDatabase.PQuery("SELECT `id`, `username`, `last_ip`, `gmlevel`, `expansion` FROM `account` WHERE `current_realm` = %u LIMIT %u", realmID, limit); if (!result) { SendSysMessage(LANG_ACCOUNT_LIST_EMPTY); @@ -352,12 +352,12 @@ bool ChatHandler::HandleAccountLockCommand(char* args) if (value) { - LoginDatabase.PExecute("UPDATE account SET locked = '1' WHERE id = '%u'", GetAccountId()); + LoginDatabase.PExecute("UPDATE `account` SET `locked` = '1' WHERE `id` = '%u'", GetAccountId()); PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED); } else { - LoginDatabase.PExecute("UPDATE account SET locked = '0' WHERE id = '%u'", GetAccountId()); + LoginDatabase.PExecute("UPDATE `account` SET `locked` = '0' WHERE `id` = '%u'", GetAccountId()); PSendSysMessage(LANG_COMMAND_ACCLOCKUNLOCKED); } @@ -532,7 +532,7 @@ bool ChatHandler::HandleBanAllIPCommand(char* args) std::string ip = ipStr; LoginDatabase.escape_string(ip); - QueryResult* result = LoginDatabase.PQuery("SELECT id, username FROM account WHERE id >= %u AND last_ip " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), minId, ip.c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT `id`, `username` FROM `account` WHERE `id` >= %u AND `last_ip` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), minId, ip.c_str()); if (!result) { PSendSysMessage("No account found on IP '%s'", ip.c_str()); @@ -553,7 +553,7 @@ bool ChatHandler::HandleBanAllIPCommand(char* args) } while (result->NextRow()); delete result; - if (result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE account IN (%s) AND level > %u GROUP BY account", allAccounts.str().c_str(), maxLevel)) + if (result = CharacterDatabase.PQuery("SELECT `account` FROM `characters` WHERE `account` IN (%s) AND `level` > %u GROUP BY `account`", allAccounts.str().c_str(), maxLevel)) { do { @@ -759,9 +759,9 @@ bool ChatHandler::HandleBanInfoCharacterCommand(char* args) bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname) { QueryResult* result = LoginDatabase.PQuery( - "SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate,banreason,bannedby,COALESCE(name, \"NoRealm\") , gmlevel " - "FROM account_banned LEFT JOIN realmlist ON realmlist.id = realm " - "WHERE account_banned.id = '%u' ORDER BY bandate ASC", accountid); + "SELECT FROM_UNIXTIME(`bandate`), `unbandate`-`bandate`, `active`, `unbandate`,`banreason`,`bannedby`,COALESCE(`name`, \"NoRealm\") , `gmlevel` " + "FROM `account_banned` LEFT JOIN `realmlist` ON `realmlist`.`id` = `realm` " + "WHERE `account_banned`.`id` = '%u' ORDER BY `bandate` ASC", accountid); if (!result) { PSendSysMessage(LANG_BANINFO_NOACCOUNTBAN, accountname); @@ -809,7 +809,7 @@ bool ChatHandler::HandleBanInfoIPCommand(char* args) std::string IP = cIP; LoginDatabase.escape_string(IP); - QueryResult* result = LoginDatabase.PQuery("SELECT ip, FROM_UNIXTIME(bandate), FROM_UNIXTIME(unbandate), unbandate-UNIX_TIMESTAMP(), banreason,bannedby,unbandate-bandate FROM ip_banned WHERE ip = '%s'", IP.c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT `ip`, FROM_UNIXTIME(`bandate`), FROM_UNIXTIME(`unbandate`), `unbandate`-UNIX_TIMESTAMP(), `banreason`,`bannedby`,`unbandate`-`bandate` FROM `ip_banned` WHERE `ip` = '%s'", IP.c_str()); if (!result) { PSendSysMessage(LANG_BANINFO_NOIP); @@ -827,7 +827,7 @@ bool ChatHandler::HandleBanInfoIPCommand(char* args) bool ChatHandler::HandleBanListCharacterCommand(char* args) { - LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); + LoginDatabase.Execute("DELETE FROM `ip_banned` WHERE `unbandate`<=UNIX_TIMESTAMP() AND `unbandate`<>`bandate`"); char* cFilter = ExtractLiteralArg(&args); if (!cFilter) @@ -835,7 +835,7 @@ bool ChatHandler::HandleBanListCharacterCommand(char* args) std::string filter = cFilter; CharacterDatabase.escape_string(filter); - QueryResult* result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), filter.c_str()); + QueryResult* result = CharacterDatabase.PQuery("SELECT `account` FROM `characters` WHERE `name` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), filter.c_str()); if (!result) { PSendSysMessage(LANG_BANLIST_NOCHARACTER); @@ -847,7 +847,7 @@ bool ChatHandler::HandleBanListCharacterCommand(char* args) bool ChatHandler::HandleBanListAccountCommand(char* args) { - LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); + LoginDatabase.Execute("DELETE FROM `ip_banned` WHERE `unbandate`<=UNIX_TIMESTAMP() AND `unbandate`<>`bandate`"); char* cFilter = ExtractLiteralArg(&args); std::string filter = cFilter ? cFilter : ""; @@ -857,13 +857,13 @@ bool ChatHandler::HandleBanListAccountCommand(char* args) if (filter.empty()) { - result = LoginDatabase.Query("SELECT account.id, username FROM account, account_banned" - " WHERE account.id = account_banned.id AND active = 1 GROUP BY account.id"); + result = LoginDatabase.Query("SELECT `account`.`id`, `username` FROM `account`, `account_banned`" + " WHERE `account`.`id` = `account_banned`.`id` AND `active` = 1 GROUP BY `account`.`id`"); } else { - result = LoginDatabase.PQuery("SELECT account.id, username FROM account, account_banned" - " WHERE account.id = account_banned.id AND active = 1 AND username " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " GROUP BY account.id", + result = LoginDatabase.PQuery("SELECT `account`.`id`, `username` FROM `account`, `account_banned`" + " WHERE `account`.`id` = `account_banned`.`id` AND `active` = 1 AND `username` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " GROUP BY `account`.`id`", filter.c_str()); } @@ -888,7 +888,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result) Field* fields = result->Fetch(); uint32 accountid = fields[0].GetUInt32(); - QueryResult* banresult = LoginDatabase.PQuery("SELECT account.username FROM account,account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id", accountid); + QueryResult* banresult = LoginDatabase.PQuery("SELECT `account`.`username` FROM `account`,`account_banned` WHERE `account_banned`.`id`='%u' AND `account_banned`.`id`=`account`.`id`", accountid); if (banresult) { Field* fields2 = banresult->Fetch(); @@ -920,7 +920,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result) sAccountMgr.GetName(account_id, account_name); // No SQL injection. id is uint32. - QueryResult* banInfo = LoginDatabase.PQuery("SELECT bandate,unbandate,bannedby,banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id); + QueryResult* banInfo = LoginDatabase.PQuery("SELECT `bandate`,`unbandate`,`bannedby`,`banreason` FROM `account_banned` WHERE `id` = %u ORDER BY `unbandate`", account_id); if (banInfo) { Field* fields2 = banInfo->Fetch(); @@ -959,7 +959,7 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result) bool ChatHandler::HandleBanListIPCommand(char* args) { - LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); + LoginDatabase.Execute("DELETE FROM `ip_banned` WHERE `unbandate`<=UNIX_TIMESTAMP() AND `unbandate`<>`bandate`"); char* cFilter = ExtractLiteralArg(&args); std::string filter = cFilter ? cFilter : ""; @@ -969,15 +969,15 @@ bool ChatHandler::HandleBanListIPCommand(char* args) if (filter.empty()) { - result = LoginDatabase.Query("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" - " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP())" - " ORDER BY unbandate"); + result = LoginDatabase.Query("SELECT `ip`,`bandate`,`unbandate`,`bannedby`,`banreason` FROM `ip_banned`" + " WHERE (`bandate`=`unbandate` OR `unbandate`>UNIX_TIMESTAMP())" + " ORDER BY `unbandate`"); } else { - result = LoginDatabase.PQuery("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned" - " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP()) AND ip " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") - " ORDER BY unbandate", filter.c_str()); + result = LoginDatabase.PQuery("SELECT `ip`,`bandate`,`unbandate`,`bannedby`,`banreason` FROM `ip_banned`" + " WHERE (`bandate`=`unbandate` OR `unbandate`>UNIX_TIMESTAMP()) AND `ip` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") + " ORDER BY `unbandate`", filter.c_str()); } if (!result) @@ -1191,7 +1191,7 @@ bool ChatHandler::HandleMuteCommand(char* args) if (target) target->GetSession()->m_muteTime = mutetime; - LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'", uint64(mutetime), account_id); + LoginDatabase.PExecute("UPDATE `account` SET `mutetime` = " UI64FMTD " WHERE `id` = '%u'", uint64(mutetime), account_id); if (target) { @@ -1255,7 +1255,7 @@ bool ChatHandler::HandleUnmuteCommand(char* args) target->GetSession()->m_muteTime = 0; } - LoginDatabase.PExecute("UPDATE account SET mutetime = '0' WHERE id = '%u'", account_id); + LoginDatabase.PExecute("UPDATE `account` SET `mutetime` = '0' WHERE `id` = '%u'", account_id); if (target) { diff --git a/src/game/Commands/CharacterCommands.cpp b/src/game/Commands/CharacterCommands.cpp index 9a35633dc..04df3c367 100644 --- a/src/game/Commands/CharacterCommands.cpp +++ b/src/game/Commands/CharacterCommands.cpp @@ -789,9 +789,9 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) { QueryResult* result = nullptr; if (it->second == 33388) // When removing Apprentice Riding check for Journeyman too. It replaces the first spell. - result = CharacterDatabase.PQuery("SELECT spell FROM character_spell WHERE guid = %u AND spell IN (33388, 33391)", target_guid.GetCounter()); + result = CharacterDatabase.PQuery("SELECT `spell` FROM `character_spell` WHERE `guid` = %u AND `spell` IN (33388, 33391)", target_guid.GetCounter()); else - result = CharacterDatabase.PQuery("SELECT spell FROM character_spell WHERE guid = %u AND spell = %u", target_guid.GetCounter(), it->second); + result = CharacterDatabase.PQuery("SELECT `spell` FROM `character_spell` WHERE `guid` = %u AND `spell` = %u", target_guid.GetCounter(), it->second); if (!result) { @@ -806,7 +806,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Horse Riding case 824: { - if (!CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill = 148 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `skill` = 148 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -817,7 +817,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Wolf Riding case 825: { - if (!CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill = 149 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `skill` = 149 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -828,7 +828,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Ram Riding case 826: { - if (!CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill = 152 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `skill` = 152 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -839,7 +839,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Tiger Riding case 828: { - if (!CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill = 150 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `skill` = 150 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -850,7 +850,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Raptor Riding case 10861: { - if (!CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill = 533 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `skill` = 533 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -861,7 +861,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Kodo Riding case 18995: { - if (!CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill = 713 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `skill` = 713 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -872,7 +872,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Apprentice Riding case 33388: { - if (!CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill = 762 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `skill` = 762 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -883,7 +883,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) // Journeyman Riding case 33391: { - if (!CharacterDatabase.PExecute("UPDATE character_skills SET value = 75, max = 75 WHERE skill = 762 AND value = 150 AND max = 150 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("UPDATE `character_skills` SET `value` = 75, `max` = 75 WHERE `skill` = 762 AND `value` = 150 AND `max` = 150 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -894,7 +894,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) } // remove the riding spell - if (!CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = %u AND guid = %u", it->second, target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_spell` WHERE `spell` = %u AND `guid` = %u", it->second, target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -907,7 +907,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) case 33388: { // Remove Journeyman Riding too or it does nothing if he has it. - if (!CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = 33391 AND guid = %u", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("DELETE FROM `character_spell` WHERE `spell` = 33391 AND `guid` = %u", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -919,7 +919,7 @@ bool ChatHandler::HandleRemoveRidingCommand(char* args) case 33391: { // Add Apprentice Riding spell. - if (!CharacterDatabase.PExecute("INSERT INTO character_spell VALUES (%u, 33388, 1, 0)", target_guid.GetCounter())) + if (!CharacterDatabase.PExecute("INSERT INTO `character_spell` VALUES (%u, 33388, 1, 0)", target_guid.GetCounter())) { SendSysMessage(LANG_REMOVE_RIDING_ERROR); SetSentErrorMessage(true); @@ -1211,7 +1211,7 @@ bool ChatHandler::GetDeletedCharacterInfoList(DeletedInfoList& foundList, bool u { // search by GUID if (isNumeric(searchString)) - resultChar = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND guid = %u LIMIT 0,50", uint32(atoi(searchString.c_str()))); + resultChar = CharacterDatabase.PQuery("SELECT `guid`, `deleteInfos_Name`, `deleteInfos_Account`, `deleteDate` FROM `characters` WHERE `deleteDate` IS NOT NULL AND `guid` = %u LIMIT 0,50", uint32(atoi(searchString.c_str()))); // search by name else { @@ -1220,14 +1220,14 @@ bool ChatHandler::GetDeletedCharacterInfoList(DeletedInfoList& foundList, bool u CharacterDatabase.escape_string(searchString); - resultChar = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND deleteInfos_Name " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT 0,50", searchString.c_str()); + resultChar = CharacterDatabase.PQuery("SELECT `guid`, `deleteInfos_Name`, `deleteInfos_Account`, `deleteDate` FROM `characters` WHERE `deleteDate` IS NOT NULL AND `deleteInfos_Name` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT 0,50", searchString.c_str()); } } else { // search by account id if (isNumeric(searchString)) - resultChar = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND deleteInfos_Account = %u LIMIT 0,50", uint32(atoi(searchString.c_str()))); + resultChar = CharacterDatabase.PQuery("SELECT `guid`, `deleteInfos_Name`, `deleteInfos_Account`, `deleteDate` FROM `characters` WHERE `deleteDate` IS NOT NULL AND `deleteInfos_Account` = %u LIMIT 0,50", uint32(atoi(searchString.c_str()))); // search by account name else { @@ -1235,7 +1235,7 @@ bool ChatHandler::GetDeletedCharacterInfoList(DeletedInfoList& foundList, bool u return false; LoginDatabase.escape_string(searchString); - QueryResult* result = LoginDatabase.PQuery("SELECT id FROM account WHERE username " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), searchString.c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT `id` FROM `account` WHERE `username` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), searchString.c_str()); std::list list; if (result) { @@ -1255,12 +1255,12 @@ bool ChatHandler::GetDeletedCharacterInfoList(DeletedInfoList& foundList, bool u std::copy(list.begin(), list.end(), std::ostream_iterator(accountStream, ",")); std::string accounts = accountStream.str(); accounts.pop_back(); - resultChar = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND deleteInfos_Account IN (%s) LIMIT 0,50", accounts.c_str()); + resultChar = CharacterDatabase.PQuery("SELECT `guid`, `deleteInfos_Name`, `deleteInfos_Account`, `deleteDate` FROM `characters` WHERE `deleteDate` IS NOT NULL AND `deleteInfos_Account` IN (%s) LIMIT 0,50", accounts.c_str()); } } } else - resultChar = CharacterDatabase.Query("SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL LIMIT 0,50"); + resultChar = CharacterDatabase.Query("SELECT `guid`, `deleteInfos_Name`, `deleteInfos_Account`, `deleteDate` FROM `characters` WHERE `deleteDate` IS NOT NULL LIMIT 0,50"); if (resultChar) { @@ -1421,7 +1421,7 @@ void ChatHandler::HandleCharacterDeletedRestoreHelper(DeletedInfo const& delInfo return; } - CharacterDatabase.PExecute("UPDATE characters SET name='%s', account='%u', deleteDate=NULL, deleteInfos_Name=NULL, deleteInfos_Account=NULL WHERE deleteDate IS NOT NULL AND guid = %u", + CharacterDatabase.PExecute("UPDATE `characters` SET `name`='%s', `account`='%u', `deleteDate`=NULL, `deleteInfos_Name`=NULL, `deleteInfos_Account`=NULL WHERE `deleteDate` IS NOT NULL AND `guid` = %u", delInfo.name.c_str(), delInfo.accountId, delInfo.lowguid); } @@ -1585,7 +1585,7 @@ bool ChatHandler::HandleCharacterEraseCommand(char* args) bool ChatHandler::HandleCleanCharactersToDeleteCommand(char* args) { - QueryResult* toDeleteCharsResult = CharacterDatabase.Query("SELECT guid FROM characters_guid_delete;"); + QueryResult* toDeleteCharsResult = CharacterDatabase.Query("SELECT `guid` FROM `characters_guid_delete`;"); if (!toDeleteCharsResult) { SendSysMessage("Table 'characters_guid_delete' is empty or does not exist."); @@ -1622,7 +1622,7 @@ bool ChatHandler::HandleCleanCharactersItemsCommand(char* args) if (m_session->GetSecurity() == SEC_CONSOLE) Real = true; - QueryResult* listDeleteItems = CharacterDatabase.Query("SELECT entry FROM characters_item_delete;"); + QueryResult* listDeleteItems = CharacterDatabase.Query("SELECT `entry` FROM `characters_item_delete`;"); if (!listDeleteItems) { SendSysMessage("Cannot find items to delete. Table 'characters_item_delete' is empty ?"); @@ -1646,7 +1646,7 @@ bool ChatHandler::HandleCleanCharactersItemsCommand(char* args) PSendSysMessage("%u items to delete.", lDeleteEntries.size()); delete listDeleteItems; - QueryResult* allPlayersItems = CharacterDatabase.Query("SELECT guid, itemEntry, owner_guid FROM item_instance;"); + QueryResult* allPlayersItems = CharacterDatabase.Query("SELECT `guid`, `itemEntry`, `owner_guid` FROM `item_instance`;"); if (!allPlayersItems) { SendSysMessage("Unable to retrieve player items list."); @@ -1716,7 +1716,7 @@ void ChatHandler::HandleCharacterLevel(Player* player, ObjectGuid player_guid, u else { // update level and XP at level, all other will be updated at loading - CharacterDatabase.PExecute("UPDATE characters SET level = '%u', xp = 0 WHERE guid = '%u'", newlevel, player_guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `characters` SET `level` = '%u', `xp` = 0 WHERE `guid` = '%u'", newlevel, player_guid.GetCounter()); } } @@ -1784,7 +1784,7 @@ bool ChatHandler::HandleCharacterRenameCommand(char* args) PSendSysMessage(LANG_RENAME_PLAYER, GetNameLink(target).c_str()); target->SetAtLoginFlag(AT_LOGIN_RENAME); - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '1' WHERE guid = '%u'", target->GetGUIDLow()); + CharacterDatabase.PExecute("UPDATE `characters` SET `at_login` = `at_login` | '1' WHERE `guid` = '%u'", target->GetGUIDLow()); } else { @@ -1795,7 +1795,7 @@ bool ChatHandler::HandleCharacterRenameCommand(char* args) std::string oldNameLink = playerLink(target_name); PSendSysMessage(LANG_RENAME_PLAYER_GUID, oldNameLink.c_str(), target_guid.GetCounter()); - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '1' WHERE guid = '%u'", target_guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `characters` SET `at_login` = `at_login` | '1' WHERE `guid` = '%u'", target_guid.GetCounter()); } return true; @@ -1853,7 +1853,7 @@ bool ChatHandler::HandleCharacterHasItemCommand(char* args) else { std::unique_ptr result(CharacterDatabase.PQuery( - "SELECT SUM(count) AS item_count FROM item_instance ii WHERE itemEntry = %u and owner_guid = %u", + "SELECT SUM(`count`) AS item_count FROM `item_instance` ii WHERE `itemEntry` = %u and `owner_guid` = %u", itemId, target_guid.GetCounter() )); @@ -2102,7 +2102,7 @@ bool ChatHandler::HandleCharacterCopySkinCommand(char* args) std::string plName(args); CharacterDatabase.escape_string(plName); // No SQL injection - QueryResult* result = CharacterDatabase.PQuery("SELECT playerBytes, playerBytes2 & 0xFF, gender FROM characters WHERE name='%s'", plName.c_str()); + QueryResult* result = CharacterDatabase.PQuery("SELECT `playerBytes`, `playerBytes2` & 0xFF, `gender` FROM `characters` WHERE `name`='%s'", plName.c_str()); if (!result) { PSendSysMessage("Player %s not found.", args); @@ -2950,7 +2950,7 @@ bool ChatHandler::HandleAddItemCommand(char* args) { std::string itemName = cId; WorldDatabase.escape_string(itemName); - QueryResult* result = WorldDatabase.PQuery("SELECT entry FROM item_template WHERE name = '%s'", itemName.c_str()); + QueryResult* result = WorldDatabase.PQuery("SELECT `entry` FROM `item_template` WHERE `name` = '%s'", itemName.c_str()); if (!result) { PSendSysMessage(LANG_COMMAND_COULDNOTFIND, cId); @@ -3047,7 +3047,7 @@ bool ChatHandler::HandleDeleteItemCommand(char* args) std::string itemName = cId; WorldDatabase.escape_string(itemName); - std::unique_ptr result(WorldDatabase.PQuery("SELECT entry FROM item_template WHERE name = '%s'", itemName.c_str())); + std::unique_ptr result(WorldDatabase.PQuery("SELECT `entry` FROM `item_template` WHERE `name` = '%s'", itemName.c_str())); if (!result) { @@ -3092,7 +3092,7 @@ bool ChatHandler::HandleDeleteItemCommand(char* args) else { std::unique_ptr result(CharacterDatabase.PQuery( - "SELECT SUM(count) AS item_count FROM item_instance ii WHERE itemEntry = %u and owner_guid = %u", + "SELECT SUM(`count`) AS item_count FROM `item_instance` ii WHERE `itemEntry` = %u and `owner_guid` = %u", itemId, target_guid.GetCounter() )); @@ -3116,7 +3116,7 @@ bool ChatHandler::HandleDeleteItemCommand(char* args) while (stacksToRemove) { result.reset(CharacterDatabase.PQuery( - "SELECT guid, count FROM item_instance ii WHERE itemEntry = %u and owner_guid = %u ORDER BY count DESC", + "SELECT `guid`, `count` FROM `item_instance` ii WHERE `itemEntry` = %u and `owner_guid` = %u ORDER BY `count` DESC", itemId, target_guid.GetCounter() )); @@ -3133,7 +3133,7 @@ bool ChatHandler::HandleDeleteItemCommand(char* args) if (stackCount > stacksToRemove) // make sure we don't delete more than requested { - if (!CharacterDatabase.PExecute("UPDATE item_instance SET count = %u WHERE guid = %u", + if (!CharacterDatabase.PExecute("UPDATE `item_instance` SET `count` = %u WHERE `guid` = %u", stackCount - stacksToRemove, guid)) { SendSysMessage("Encountered an error while attempting to adjust item stack count"); @@ -3145,28 +3145,28 @@ bool ChatHandler::HandleDeleteItemCommand(char* args) } else { - if (!CharacterDatabase.DirectPExecute("DELETE FROM item_instance WHERE guid = %u", guid)) + if (!CharacterDatabase.DirectPExecute("DELETE FROM `item_instance` WHERE `guid` = %u", guid)) { SendSysMessage("Encountered an error while attempting to remove item instance"); SetSentErrorMessage(true); return false; } - if (!CharacterDatabase.DirectPExecute("DELETE FROM character_inventory WHERE item = %u", guid)) + if (!CharacterDatabase.DirectPExecute("DELETE FROM `character_inventory` WHERE `item` = %u", guid)) { SendSysMessage("Encountered an error while attempting to remove item from inventory"); SetSentErrorMessage(true); return false; } - if (!CharacterDatabase.DirectPExecute("DELETE FROM character_gifts WHERE item_guid = %u", guid)) + if (!CharacterDatabase.DirectPExecute("DELETE FROM `character_gifts` WHERE `item_guid` = %u", guid)) { SendSysMessage("Encountered an error while attempting to remove item from gifts"); SetSentErrorMessage(true); return false; } - if (!CharacterDatabase.DirectPExecute("DELETE FROM mail_items WHERE item_guid = %u", guid)) + if (!CharacterDatabase.DirectPExecute("DELETE FROM `mail_items` WHERE `item_guid` = %u", guid)) { SendSysMessage("Encountered an error while attempting to remove item from mail"); SetSentErrorMessage(true); @@ -3275,7 +3275,7 @@ bool ChatHandler::HandleListItemCommand(char* args) // inventory case uint32 inv_count = 0; - result = CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM character_inventory WHERE item_template='%u'", item_id); + result = CharacterDatabase.PQuery("SELECT COUNT(`item_template`) FROM `character_inventory` WHERE `item_template`='%u'", item_id); if (result) { inv_count = (*result)[0].GetUInt32(); @@ -3283,10 +3283,10 @@ bool ChatHandler::HandleListItemCommand(char* args) } result = CharacterDatabase.PQuery( - // 0 1 2 3 4 5 - "SELECT ci.item, cibag.slot AS bag, ci.slot, ci.guid, characters.account,characters.name " - "FROM character_inventory AS ci LEFT JOIN character_inventory AS cibag ON (cibag.item=ci.bag),characters " - "WHERE ci.item_template='%u' AND ci.guid = characters.guid LIMIT %u ", + // 0 1 2 3 4 5 + "SELECT ci.`item`, cibag.`slot` AS bag, ci.`slot`, ci.`guid`, `characters`.`account`, `characters`.`name` " + "FROM `character_inventory` AS ci LEFT JOIN `character_inventory` AS cibag ON (cibag.`item`=ci.`bag`), `characters` " + "WHERE ci.`item_template`='%u' AND ci.`guid` = `characters`.`guid` LIMIT %u ", item_id, uint32(count)); if (result) @@ -3328,7 +3328,7 @@ bool ChatHandler::HandleListItemCommand(char* args) // mail case uint32 mail_count = 0; - result = CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM mail_items WHERE item_template='%u'", item_id); + result = CharacterDatabase.PQuery("SELECT COUNT(`item_template`) FROM `mail_items` WHERE `item_template`='%u'", item_id); if (result) { mail_count = (*result)[0].GetUInt32(); @@ -3338,10 +3338,10 @@ bool ChatHandler::HandleListItemCommand(char* args) if (count > 0) { result = CharacterDatabase.PQuery( - // 0 1 2 3 4 5 6 - "SELECT mail_items.item_guid, mail.sender, mail.receiver, char_s.account, char_s.name, char_r.account, char_r.name " - "FROM mail,mail_items,characters as char_s,characters as char_r " - "WHERE mail_items.item_template='%u' AND char_s.guid = mail.sender AND char_r.guid = mail.receiver AND mail.id=mail_items.mail_id LIMIT %u", + // 0 1 2 3 4 5 6 + "SELECT `mail_items`.`item_guid`, `mail`.`sender`, `mail`.`receiver`, char_s.`account`, char_s.`name`, char_r.`account`, char_r.`name` " + "FROM `mail`, `mail_items`, `characters` as char_s, `characters` as char_r " + "WHERE `mail_items`.`item_template`='%u' AND char_s.`guid` = `mail`.`sender` AND char_r.`guid` = `mail`.`receiver` AND `mail`.`id`=`mail_items`.`mail_id` LIMIT %u", item_id, uint32(count)); } else @@ -3379,7 +3379,7 @@ bool ChatHandler::HandleListItemCommand(char* args) // auction case uint32 auc_count = 0; - result = CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM auction WHERE item_template='%u'", item_id); + result = CharacterDatabase.PQuery("SELECT COUNT(`item_template`) FROM `auction` WHERE `item_template`='%u'", item_id); if (result) { auc_count = (*result)[0].GetUInt32(); @@ -3389,9 +3389,9 @@ bool ChatHandler::HandleListItemCommand(char* args) if (count > 0) { result = CharacterDatabase.PQuery( - // 0 1 2 3 - "SELECT auction.itemguid, auction.itemowner, characters.account, characters.name " - "FROM auction,characters WHERE auction.item_template='%u' AND characters.guid = auction.itemowner LIMIT %u", + // 0 1 2 3 + "SELECT `auction`.`itemguid`, `auction`.`itemowner`, `characters`.`account`, `characters`.`name` " + "FROM `auction`, `characters` WHERE `auction`.`item_template`='%u' AND `characters`.`guid` = `auction`.`itemowner` LIMIT %u", item_id, uint32(count)); } else @@ -3575,7 +3575,7 @@ bool ChatHandler::HandleResetSpellsCommand(char* args) } else { - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'", uint32(AT_LOGIN_RESET_SPELLS), target_guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `characters` SET `at_login` = `at_login` | '%u' WHERE `guid` = '%u'", uint32(AT_LOGIN_RESET_SPELLS), target_guid.GetCounter()); PSendSysMessage(LANG_RESET_SPELLS_OFFLINE, target_name.c_str()); } @@ -3601,7 +3601,7 @@ bool ChatHandler::HandleResetTalentsCommand(char* args) else if (target_guid) { uint32 at_flags = AT_LOGIN_RESET_TALENTS; - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'", at_flags, target_guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `characters` SET `at_login` = `at_login` | '%u' WHERE `guid` = '%u'", at_flags, target_guid.GetCounter()); std::string nameLink = playerLink(target_name); PSendSysMessage(LANG_RESET_TALENTS_OFFLINE, nameLink.c_str()); } @@ -3691,7 +3691,7 @@ bool ChatHandler::HandleResetAllCommand(char* args) return false; } - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'", atLogin, atLogin); + CharacterDatabase.PExecute("UPDATE `characters` SET `at_login` = `at_login` | '%u' WHERE (`at_login` & '%u') = '0'", atLogin, atLogin); HashMapHolder::MapType const& plist = sObjectAccessor.GetPlayers(); for (const auto& itr : plist) itr.second->SetAtLoginFlag(atLogin); @@ -4870,7 +4870,7 @@ QuestStatusData HandleQuestStatusCommandHelper(uint32 quest_id, Player const* pl else { std::unique_ptr result(CharacterDatabase.PQuery( - "SELECT status, rewarded, reward_choice FROM character_queststatus WHERE guid = %u AND quest = %u", + "SELECT `status`, `rewarded`, `reward_choice` FROM `character_queststatus` WHERE `guid` = %u AND `quest` = %u", guid->GetCounter(), quest_id )); @@ -5032,7 +5032,7 @@ bool ChatHandler::HandlePetRenameCommand(char* args) return false; } - std::unique_ptr result(CharacterDatabase.PQuery("SELECT owner, name FROM character_pet WHERE id = %u", petId)); + std::unique_ptr result(CharacterDatabase.PQuery("SELECT `owner`, `name` FROM `character_pet` WHERE `id` = %u", petId)); if (!result) { @@ -5072,7 +5072,7 @@ bool ChatHandler::HandlePetDeleteCommand(char* args) return false; } PSendSysMessage("Pet #%u (\"%s\", owner #%u) deleted.", petData->id, petData->name.c_str(), petData->owner); - CharacterDatabase.PExecute("DELETE FROM character_pet WHERE id = %u", petId); + CharacterDatabase.PExecute("DELETE FROM `character_pet` WHERE `id` = %u", petId); sCharacterDatabaseCache.DeleteCharacterPetById(petId); return true; } diff --git a/src/game/Commands/LookupCommands.cpp b/src/game/Commands/LookupCommands.cpp index b6888e038..c5bf1f847 100644 --- a/src/game/Commands/LookupCommands.cpp +++ b/src/game/Commands/LookupCommands.cpp @@ -60,7 +60,7 @@ bool ChatHandler::HandleListObjectCommand(char* args) QueryResult* result; uint32 obj_count = 0; - result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'", go_id); + result = WorldDatabase.PQuery("SELECT COUNT(`guid`) FROM `gameobject` WHERE `id`='%u'", go_id); if (result) { obj_count = (*result)[0].GetUInt32(); @@ -70,11 +70,11 @@ bool ChatHandler::HandleListObjectCommand(char* args) if (m_session) { Player* pl = m_session->GetPlayer(); - result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", + result = WorldDatabase.PQuery("SELECT `guid`, `position_x`, `position_y`, `position_z`, `map`, (POW(`position_x` - '%f', 2) + POW(`position_y` - '%f', 2) + POW(`position_z` - '%f', 2)) AS order_ FROM `gameobject` WHERE `id` = '%u' ORDER BY order_ ASC LIMIT %u", pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), go_id, uint32(count)); } else - result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map FROM gameobject WHERE id = '%u' LIMIT %u", + result = WorldDatabase.PQuery("SELECT `guid`, `position_x`, `position_y`, `position_z`, `map` FROM `gameobject` WHERE `id` = '%u' LIMIT %u", go_id, uint32(count)); if (result) @@ -131,7 +131,7 @@ bool ChatHandler::HandleListCreatureCommand(char* args) QueryResult* result; uint32 cr_count = 0; - result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'", cr_id); + result = WorldDatabase.PQuery("SELECT COUNT(`guid`) FROM `creature` WHERE `id`='%u'", cr_id); if (result) { cr_count = (*result)[0].GetUInt32(); @@ -141,11 +141,11 @@ bool ChatHandler::HandleListCreatureCommand(char* args) if (m_session) { Player* pl = m_session->GetPlayer(); - result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM creature WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", + result = WorldDatabase.PQuery("SELECT `guid`, `position_x`, `position_y`, `position_z`, `map`, (POW(`position_x` - '%f', 2) + POW(`position_y` - '%f', 2) + POW(`position_z` - '%f', 2)) AS order_ FROM `creature` WHERE `id` = '%u' ORDER BY order_ ASC LIMIT %u", pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), cr_id, uint32(count)); } else - result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map FROM creature WHERE id = '%u' LIMIT %u", + result = WorldDatabase.PQuery("SELECT `guid`, `position_x`, `position_y`, `position_z`, `map` FROM `creature` WHERE `id` = '%u' LIMIT %u", cr_id, uint32(count)); if (result) @@ -930,8 +930,8 @@ bool ChatHandler::HandleLookupAccountEmailCommand(char* args) // No wildcard in front, cannot use table index LoginDatabase.AsyncPQuery(AccountSearchHandler::HandleAccountLookupResult, GetAccountId(), limit, - // 0 1 2 3 4 - "SELECT id, username, last_ip, 0, expansion FROM account WHERE email " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT %u", + // 0 1 2 3 4 + "SELECT `id`, `username`, `last_ip`, 0, `expansion` FROM `account` WHERE `email` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT %u", email.c_str(), limit); return true; @@ -951,8 +951,8 @@ bool ChatHandler::ShowAccountIpListHelper(char* args, bool onlineonly) LoginDatabase.escape_string(ip); char const* query = onlineonly - ? "SELECT id, username, last_ip, 0, expansion FROM account WHERE online = 1 AND last_ip " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT %u" - : "SELECT id, username, last_ip, 0, expansion FROM account WHERE last_ip " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT %u"; + ? "SELECT `id`, `username`, `last_ip`, 0, `expansion` FROM `account` WHERE `online` = 1 AND `last_ip` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT %u" + : "SELECT `id`, `username`, `last_ip`, 0, `expansion` FROM `account` WHERE `last_ip` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'") " LIMIT %u"; LoginDatabase.AsyncPQuery(AccountSearchHandler::HandleAccountLookupResult, GetAccountId(), limit, query, ip.c_str(), limit); @@ -986,8 +986,8 @@ bool ChatHandler::HandleLookupAccountNameCommand(char* args) LoginDatabase.escape_string(account); LoginDatabase.AsyncPQuery(AccountSearchHandler::HandleAccountLookupResult, GetAccountId(), limit, - // 0 1 2 3 4 - "SELECT id, username, last_ip, 0, expansion FROM account WHERE username " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'") " LIMIT %u", + // 0 1 2 3 4 + "SELECT `id`, `username`, `last_ip`, 0, `expansion` FROM `account` WHERE `username` " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'") " LIMIT %u", account.c_str(), limit); return true; @@ -1006,7 +1006,7 @@ bool ChatHandler::HandleLookupPlayerIpCommand(char* args) QueryResult* result = nullptr; std::string ip = ipStr; LoginDatabase.escape_string(ip); - result = LoginDatabase.PQuery("SELECT id, username FROM account WHERE last_ip " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), ip.c_str()); + result = LoginDatabase.PQuery("SELECT `id`, `username` FROM `account` WHERE `last_ip` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), ip.c_str()); return LookupPlayerSearchCommand(result, &limit); } @@ -1027,7 +1027,7 @@ bool ChatHandler::HandleLookupPlayerAccountCommand(char* args) LoginDatabase.escape_string(account); - QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE username " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), account.c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT `id`, `username` FROM `account` WHERE `username` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), account.c_str()); return LookupPlayerSearchCommand(result, &limit); } @@ -1045,7 +1045,7 @@ bool ChatHandler::HandleLookupPlayerEmailCommand(char* args) std::string email = emailStr; LoginDatabase.escape_string(email); - QueryResult* result = LoginDatabase.PQuery("SELECT id,username FROM account WHERE email " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), email.c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT `id`, `username` FROM `account` WHERE `email` " _LIKE_ " " _CONCAT2_("'%s'", "'%%'"), email.c_str()); return LookupPlayerSearchCommand(result, &limit); } @@ -1066,7 +1066,7 @@ bool ChatHandler::HandleLookupPlayerNameCommand(char* args) CharacterDatabase.AsyncPQuery(&PlayerSearchHandler::HandlePlayerCharacterLookupResult, GetAccountId(), limit_original, - "SELECT guid, name, race, class, level FROM characters WHERE name " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), + "SELECT `guid`, `name`, `race`, `class`, `level` FROM `characters` WHERE `name` " _LIKE_ " " _CONCAT3_("'%%'", "'%s'", "'%%'"), name.c_str()); return true; @@ -1086,7 +1086,7 @@ bool ChatHandler::HandleLookupPlayerCharacterCommand(char* args) std::string normalizedName = nameStr; if (normalizePlayerName(normalizedName)) if (PlayerCacheData const* data = sObjectMgr.GetPlayerDataByName(normalizedName)) - if (result = LoginDatabase.PQuery("SELECT id, last_ip FROM account WHERE id = %u", data->uiAccount)) + if (result = LoginDatabase.PQuery("SELECT `id`, `last_ip` FROM `account` WHERE `id` = %u", data->uiAccount)) { Field* fields = result->Fetch(); uint32 id = fields[0].GetInt32(); @@ -1098,7 +1098,7 @@ bool ChatHandler::HandleLookupPlayerCharacterCommand(char* args) return LookupPlayerSearchCommand(nullptr, &limit); LoginDatabase.escape_string(ip); - result = LoginDatabase.PQuery("SELECT id, username FROM account WHERE last_ip = '%s'", ip.c_str()); + result = LoginDatabase.PQuery("SELECT `id`, `username` FROM `account` WHERE `last_ip` = '%s'", ip.c_str()); } return LookupPlayerSearchCommand(result, &limit); @@ -1133,7 +1133,7 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, uint32* limit) uint32 acc_id = fields[0].GetUInt32(); std::string acc_name = fields[1].GetCppString(); - holder->SetPQuery(count, "SELECT guid, name, race, class, level FROM characters WHERE account = %u", acc_id); + holder->SetPQuery(count, "SELECT `guid`, `name`, `race`, `class`, `level` FROM `characters` WHERE `account` = %u", acc_id); holder->AddAccountInfo(count, acc_id, acc_name); ++count; diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp index c1617648f..a9f2604bf 100644 --- a/src/game/CreatureGroups.cpp +++ b/src/game/CreatureGroups.cpp @@ -251,14 +251,14 @@ void CreatureGroup::DisbandGroup(Creature* pMember) void CreatureGroup::DeleteFromDb() { - WorldDatabase.PExecute("DELETE FROM creature_groups WHERE leader_guid=%u", m_originalLeaderGuid.GetCounter()); + WorldDatabase.PExecute("DELETE FROM `creature_groups` WHERE `leader_guid`=%u", m_originalLeaderGuid.GetCounter()); } void CreatureGroup::SaveToDb() { DeleteFromDb(); for (const auto& itr : m_members) - WorldDatabase.PExecute("INSERT INTO creature_groups SET leader_guid=%u, member_guid=%u, dist='%f', angle='%f', flags=%u", + WorldDatabase.PExecute("INSERT INTO `creature_groups` SET `leader_guid`=%u, `member_guid`=%u, `dist`='%f', `angle`='%f', `flags`=%u", m_originalLeaderGuid.GetCounter(), itr.first.GetCounter(), itr.second->followDistance, itr.second->followAngle, itr.second->memberFlags); } diff --git a/src/game/Database/CharacterDatabaseCache.cpp b/src/game/Database/CharacterDatabaseCache.cpp index f1f9c1b5e..d3264078e 100644 --- a/src/game/Database/CharacterDatabaseCache.cpp +++ b/src/game/Database/CharacterDatabaseCache.cpp @@ -29,19 +29,19 @@ void CharacterDatabaseCache::LoadCharacterPet(uint32 singlePetId) if (singlePetId) { result.reset(CharacterDatabase.PQuery( - "SELECT id, entry, owner, modelid, level, exp, Reactstate, loyaltypoints, loyalty, trainpoint, " - "slot, name, renamed, curhealth, curmana, curhappiness, abdata, TeachSpelldata, savetime, resettalents_cost, " - "resettalents_time, CreatedBySpell, PetType FROM character_pet WHERE id=%u", singlePetId + "SELECT `id`, `entry`, `owner`, `modelid`, `level`, `exp`, `Reactstate`, `loyaltypoints`, `loyalty`, `trainpoint`, " + "`slot`, `name`, `renamed`, `curhealth`, `curmana`, `curhappiness`, `abdata`, `TeachSpelldata`, `savetime`, `resettalents_cost`, " + "`resettalents_time`, `CreatedBySpell`, `PetType` FROM `character_pet` WHERE `id`=%u", singlePetId )); } else if (!singlePetId) { m_petsByCharacter.clear(); - sLog.outString("* Loading de `character_pet`"); + sLog.outString("* Loading table `character_pet`"); result.reset(CharacterDatabase.Query( - "SELECT id, entry, owner, modelid, level, exp, Reactstate, loyaltypoints, loyalty, trainpoint, " - "slot, name, renamed, curhealth, curmana, curhappiness, abdata, TeachSpelldata, savetime, resettalents_cost, " - "resettalents_time, CreatedBySpell, PetType FROM character_pet" + "SELECT `id`, `entry`, `owner`, `modelid`, `level`, `exp`, `Reactstate`, `loyaltypoints`, `loyalty`, `trainpoint`, " + "`slot`, `name`, `renamed`, `curhealth`, `curmana`, `curhappiness`, `abdata`, `TeachSpelldata`, `savetime`, `resettalents_cost`, " + "`resettalents_time`, `CreatedBySpell`, `PetType` FROM `character_pet`" )); } @@ -91,8 +91,8 @@ void CharacterDatabaseCache::LoadPetSpell(uint32 singlePetId) if (singlePetId) { result.reset(CharacterDatabase.PQuery( - "SELECT guid,spell,active " - "FROM pet_spell WHERE guid=%u", singlePetId + "SELECT `guid`, `spell`, `active` " + "FROM `pet_spell` WHERE `guid`=%u", singlePetId )); } else @@ -103,8 +103,8 @@ void CharacterDatabaseCache::LoadPetSpell(uint32 singlePetId) sLog.outString("* Loading `pet_spell`"); result.reset(CharacterDatabase.Query( - "SELECT guid,spell,active " - "FROM pet_spell ORDER BY guid ASC" + "SELECT `guid`, `spell`, `active` " + "FROM `pet_spell` ORDER BY `guid` ASC" )); } @@ -141,8 +141,8 @@ void CharacterDatabaseCache::LoadPetSpellCooldown(uint32 singlePetId) if (singlePetId) { result.reset(CharacterDatabase.PQuery( - "SELECT guid,spell,time " - "FROM pet_spell_cooldown WHERE guid=%u", singlePetId + "SELECT `guid`, `spell`, `time` " + "FROM `pet_spell_cooldown` WHERE `guid`=%u", singlePetId )); } else @@ -153,8 +153,8 @@ void CharacterDatabaseCache::LoadPetSpellCooldown(uint32 singlePetId) sLog.outString("* Loading `pet_spell_cooldown`"); result.reset(CharacterDatabase.Query( - "SELECT guid,spell,time " - "FROM pet_spell_cooldown ORDER BY guid ASC" + "SELECT `guid`, `spell`, `time` " + "FROM `pet_spell_cooldown` ORDER BY `guid` ASC" )); } @@ -192,9 +192,9 @@ void CharacterDatabaseCache::LoadPetAura(uint32 singlePetId) if (singlePetId) { result.reset(CharacterDatabase.PQuery( - "SELECT guid, caster_guid, item_guid, spell, stackcount, remaincharges, maxduration, remaintime, effIndexMask, " - "basepoints0, basepoints1, basepoints2, periodictime0, periodictime1, periodictime2 " - "FROM pet_aura WHERE guid=%u", singlePetId + "SELECT `guid`, `caster_guid`, `item_guid`, `spell`, `stackcount`, `remaincharges`, `maxduration`, `remaintime`, `effIndexMask`, " + "`basepoints0`, `basepoints1`, `basepoints2`, `periodictime0`, `periodictime1`, `periodictime2` " + "FROM `pet_aura` WHERE `guid`=%u", singlePetId )); } else @@ -205,11 +205,11 @@ void CharacterDatabaseCache::LoadPetAura(uint32 singlePetId) sLog.outString("* Loading table `pet_aura`"); result.reset(CharacterDatabase.Query( - // 0 1 2 3 4 5 6 7 8 - "SELECT guid, caster_guid, item_guid, spell, stackcount, remaincharges, maxduration, remaintime, effIndexMask, " - // 9 -> 11 12 -> 14 - "basepoints0, basepoints1, basepoints2, periodictime0, periodictime1, periodictime2 " - "FROM pet_aura ORDER BY guid ASC" + // 0 1 2 3 4 5 6 7 8 + "SELECT `guid`, `caster_guid`, `item_guid`, `spell`, `stackcount`, `remaincharges`, `maxduration`, `remaintime`, `effIndexMask`, " + // 9 -> 11 12 -> 14 + "`basepoints0`, `basepoints1`, `basepoints2`, `periodictime0`, `periodictime1`, `periodictime2` " + "FROM `pet_aura` ORDER BY `guid` ASC" )); } diff --git a/src/game/Group/Group.cpp b/src/game/Group/Group.cpp index cd8cb5948..4bf4868bf 100644 --- a/src/game/Group/Group.cpp +++ b/src/game/Group/Group.cpp @@ -141,10 +141,10 @@ bool Group::Create(ObjectGuid guid, char const* name) // store group in database CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM groups WHERE groupId ='%u'", m_Id); - CharacterDatabase.PExecute("DELETE FROM group_member WHERE groupId ='%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `groups` WHERE `groupId` ='%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `group_member` WHERE `groupId` ='%u'", m_Id); - CharacterDatabase.PExecute("INSERT INTO groups(groupId,leaderGuid,mainTank,mainAssistant,lootMethod,looterGuid,lootThreshold,icon1,icon2,icon3,icon4,icon5,icon6,icon7,icon8,isRaid) " + CharacterDatabase.PExecute("INSERT INTO `groups` (`groupId`, `leaderGuid`, `mainTank`, `mainAssistant`, `lootMethod`, `looterGuid`, `lootThreshold`, `icon1`, `icon2`, `icon3`, `icon4`, `icon5`, `icon6`, `icon7`, `icon8`, `isRaid`) " "VALUES('%u','%u','%u','%u','%u','%u','%u','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','" UI64FMTD "','%u')", m_Id, m_leaderGuid.GetCounter(), m_mainTankGuid.GetCounter(), m_mainAssistantGuid.GetCounter(), uint32(m_lootMethod), m_looterGuid.GetCounter(), uint32(m_lootThreshold), @@ -229,7 +229,7 @@ void Group::ConvertToRaid() _initRaidSubGroupsCounter(); if (!isBGGroup()) - CharacterDatabase.PExecute("UPDATE groups SET isRaid = 1 WHERE groupId='%u'", m_Id); + CharacterDatabase.PExecute("UPDATE `groups` SET `isRaid` = 1 WHERE `groupId`='%u'", m_Id); SendUpdate(); // update quest related GO states (quest activity dependent from raid membership) @@ -522,8 +522,8 @@ void Group::Disband(bool hideDestroy) if (!isBGGroup()) { CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM groups WHERE groupId='%u'", m_Id); - CharacterDatabase.PExecute("DELETE FROM group_member WHERE groupId='%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `groups` WHERE `groupId`='%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `group_member` WHERE `groupId`='%u'", m_Id); CharacterDatabase.CommitTransaction(); ResetInstances(INSTANCE_RESET_GROUP_DISBAND, nullptr); } @@ -1424,7 +1424,7 @@ bool Group::_addMember(ObjectGuid guid, char const* name, bool isAssistant, uint if (!isBGGroup() && !(player && player->IsBot())) { // insert into group table - CharacterDatabase.PExecute("INSERT INTO group_member(groupId,memberGuid,assistant,subgroup) VALUES('%u','%u','%u','%u')", + CharacterDatabase.PExecute("INSERT INTO `group_member` (`groupId`, `memberGuid`, `assistant`, `subgroup`) VALUES('%u','%u','%u','%u')", m_Id, member.guid.GetCounter(), ((member.assistant == 1) ? 1 : 0), member.group); } @@ -1460,7 +1460,7 @@ bool Group::_removeMember(ObjectGuid guid) } if (!isBGGroup()) - CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid='%u'", guid.GetCounter()); + CharacterDatabase.PExecute("DELETE FROM `group_member` WHERE `memberGuid`='%u'", guid.GetCounter()); if (m_leaderGuid == guid) // leader was removed { @@ -1538,8 +1538,8 @@ void Group::_setLeader(ObjectGuid guid) // in the DB also remove solo binds that will be replaced with permbinds // from the new leader CharacterDatabase.PExecute( - "DELETE FROM group_instance WHERE leaderguid='%u' AND (permanent = 1 OR " - "instance IN (SELECT instance FROM character_instance WHERE guid = '%u')" + "DELETE FROM `group_instance` WHERE `leaderguid`='%u' AND (`permanent` = 1 OR " + "`instance` IN (SELECT `instance` FROM `character_instance` WHERE `guid` = '%u')" ")", leader_lowguid, slot_lowguid); Player* player = sObjectMgr.GetPlayer(slot->guid); @@ -1559,7 +1559,7 @@ void Group::_setLeader(ObjectGuid guid) } // update the group's solo binds to the new leader - CharacterDatabase.PExecute("UPDATE group_instance SET leaderGuid='%u' WHERE leaderGuid = '%u'", + CharacterDatabase.PExecute("UPDATE `group_instance` SET `leaderGuid`='%u' WHERE `leaderGuid` = '%u'", slot_lowguid, leader_lowguid); // copy the permanent binds from the new leader to the group @@ -1568,7 +1568,7 @@ void Group::_setLeader(ObjectGuid guid) Player::ConvertInstancesToGroup(player, this, slot->guid); // update the group leader - CharacterDatabase.PExecute("UPDATE groups SET leaderGuid='%u' WHERE groupId='%u'", slot_lowguid, m_Id); + CharacterDatabase.PExecute("UPDATE `groups` SET `leaderGuid`='%u' WHERE `groupId`='%u'", slot_lowguid, m_Id); CharacterDatabase.CommitTransaction(); } @@ -1631,8 +1631,8 @@ bool Group::_swapMembersGroup(ObjectGuid guid, ObjectGuid swapGuid) // Don't need to change group counters since we are swapping if (!isBGGroup()) { - CharacterDatabase.PExecute("UPDATE group_member SET subgroup='%u' WHERE memberGuid='%u'", slot->group, guid.GetCounter()); - CharacterDatabase.PExecute("UPDATE group_member SET subgroup='%u' WHERE memberGuid='%u'", swapSlot->group, swapGuid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `group_member` SET `subgroup`='%u' WHERE `memberGuid`='%u'", slot->group, guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `group_member` SET `subgroup`='%u' WHERE `memberGuid`='%u'", swapSlot->group, swapGuid.GetCounter()); } return true; @@ -1649,7 +1649,7 @@ bool Group::_setMembersGroup(ObjectGuid guid, uint8 group) SubGroupCounterIncrease(group); if (!isBGGroup()) - CharacterDatabase.PExecute("UPDATE group_member SET subgroup='%u' WHERE memberGuid='%u'", group, guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `group_member` SET `subgroup`='%u' WHERE `memberGuid`='%u'", group, guid.GetCounter()); return true; } @@ -1662,7 +1662,7 @@ bool Group::_setAssistantFlag(ObjectGuid guid, bool const& state) slot->assistant = state; if (!isBGGroup()) - CharacterDatabase.PExecute("UPDATE group_member SET assistant='%u' WHERE memberGuid='%u'", (state) ? 1 : 0, guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `group_member` SET `assistant`='%u' WHERE `memberGuid`='%u'", (state) ? 1 : 0, guid.GetCounter()); return true; } @@ -1684,7 +1684,7 @@ bool Group::_setMainTank(ObjectGuid guid) m_mainTankGuid = guid; if (!isBGGroup()) - CharacterDatabase.PExecute("UPDATE groups SET mainTank='%u' WHERE groupId='%u'", m_mainTankGuid.GetCounter(), m_Id); + CharacterDatabase.PExecute("UPDATE `groups` SET `mainTank`='%u' WHERE `groupId`='%u'", m_mainTankGuid.GetCounter(), m_Id); return true; } @@ -1707,7 +1707,7 @@ bool Group::_setMainAssistant(ObjectGuid guid) m_mainAssistantGuid = guid; if (!isBGGroup()) - CharacterDatabase.PExecute("UPDATE groups SET mainAssistant='%u' WHERE groupId='%u'", + CharacterDatabase.PExecute("UPDATE `groups` SET `mainAssistant`='%u' WHERE `groupId`='%u'", m_mainAssistantGuid.GetCounter(), m_Id); return true; @@ -1990,7 +1990,7 @@ void Group::ResetInstances(InstanceResetMethod method, Player* SendMsgTo) if (state->CanReset()) state->DeleteFromDB(); else - CharacterDatabase.PExecute("DELETE FROM group_instance WHERE instance = '%u'", state->GetInstanceId()); + CharacterDatabase.PExecute("DELETE FROM `group_instance` WHERE `instance` = '%u'", state->GetInstanceId()); // i don't know for sure if hash_map iterators m_boundInstances.erase(itr); itr = m_boundInstances.begin(); @@ -2028,11 +2028,11 @@ InstanceGroupBind* Group::BindToInstance(DungeonPersistentState* state, bool per // when a boss is killed or when copying the players's binds to the group if (permanent != bind.perm || state != bind.state) if (!load) - CharacterDatabase.PExecute("UPDATE group_instance SET instance = '%u', permanent = '%u' WHERE leaderGuid = '%u' AND instance = '%u'", + CharacterDatabase.PExecute("UPDATE `group_instance` SET `instance` = '%u', `permanent` = '%u' WHERE `leaderGuid` = '%u' AND `instance` = '%u'", state->GetInstanceId(), permanent, GetLeaderGuid().GetCounter(), bind.state->GetInstanceId()); } else if (!load) - CharacterDatabase.PExecute("INSERT INTO group_instance (leaderGuid, instance, permanent) VALUES ('%u', '%u', '%u')", + CharacterDatabase.PExecute("INSERT INTO `group_instance` (`leaderGuid`, `instance`, `permanent`) VALUES ('%u', '%u', '%u')", GetLeaderGuid().GetCounter(), state->GetInstanceId(), permanent); if (bind.state != state) @@ -2059,7 +2059,7 @@ void Group::UnbindInstance(uint32 mapid, bool unload) if (itr != m_boundInstances.end()) { if (!unload) - CharacterDatabase.PExecute("DELETE FROM group_instance WHERE leaderGuid = '%u' AND instance = '%u'", + CharacterDatabase.PExecute("DELETE FROM `group_instance` WHERE `leaderGuid` = '%u' AND `instance` = '%u'", GetLeaderGuid().GetCounter(), itr->second.state->GetInstanceId()); itr->second.state->RemoveGroup(this); // save can become invalid m_boundInstances.erase(itr); diff --git a/src/game/Guild/Guild.cpp b/src/game/Guild/Guild.cpp index 2aa556d31..e60c8771b 100644 --- a/src/game/Guild/Guild.cpp +++ b/src/game/Guild/Guild.cpp @@ -54,7 +54,7 @@ void MemberSlot::SetPNOTE(std::string pnote) // pnote now can be used for encoding to DB CharacterDatabase.escape_string(pnote); - CharacterDatabase.PExecute("UPDATE guild_member SET pnote = '%s' WHERE guid = '%u'", pnote.c_str(), guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `guild_member` SET `pnote` = '%s' WHERE `guid` = '%u'", pnote.c_str(), guid.GetCounter()); } void MemberSlot::SetOFFNOTE(std::string offnote) @@ -63,7 +63,7 @@ void MemberSlot::SetOFFNOTE(std::string offnote) // offnote now can be used for encoding to DB CharacterDatabase.escape_string(offnote); - CharacterDatabase.PExecute("UPDATE guild_member SET offnote = '%s' WHERE guid = '%u'", offnote.c_str(), guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `guild_member` SET `offnote` = '%s' WHERE `guid` = '%u'", offnote.c_str(), guid.GetCounter()); } void MemberSlot::ChangeRank(uint32 newRank) @@ -75,7 +75,7 @@ void MemberSlot::ChangeRank(uint32 newRank) if (player) player->SetRank(newRank); - CharacterDatabase.PExecute("UPDATE guild_member SET rank='%u' WHERE guid='%u'", newRank, guid.GetCounter()); + CharacterDatabase.PExecute("UPDATE `guild_member` SET `rank`='%u' WHERE `guid`='%u'", newRank, guid.GetCounter()); } //// Guild ///////////////////////////////////////////////// @@ -162,8 +162,8 @@ bool Guild::Create(Player* leader, std::string gname) CharacterDatabase.BeginTransaction(); // CharacterDatabase.PExecute("DELETE FROM guild WHERE guildid='%u'", Id); - MAX(guildid)+1 not exist - CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guildid='%u'", m_Id); - CharacterDatabase.PExecute("INSERT INTO guild (guildid,name,leaderguid,info,motd,createdate,EmblemStyle,EmblemColor,BorderStyle,BorderColor,BackgroundColor) " + CharacterDatabase.PExecute("DELETE FROM `guild_member` WHERE `guildid`='%u'", m_Id); + CharacterDatabase.PExecute("INSERT INTO `guild` (`guildid`, `name`, `leaderguid`, `info`, `motd`, `createdate`, `EmblemStyle`, `EmblemColor`, `BorderStyle`, `BorderColor`, `BackgroundColor`) " "VALUES('%u','%s','%u', '%s', '%s','" UI64FMTD "','%u','%u','%u','%u','%u')", m_Id, gname.c_str(), m_LeaderGuid.GetCounter(), dbGINFO.c_str(), dbMOTD.c_str(), uint64(now), m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor); CharacterDatabase.CommitTransaction(); @@ -175,7 +175,7 @@ bool Guild::Create(Player* leader, std::string gname) void Guild::CreateDefaultGuildRanks(int locale_idx) { - CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid='%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `guild_rank` WHERE `guildid`='%u'", m_Id); CreateRank(sObjectMgr.GetMangosString(LANG_GUILD_MASTER, locale_idx), GR_RIGHT_ALL); CreateRank(sObjectMgr.GetMangosString(LANG_GUILD_OFFICER, locale_idx), GR_RIGHT_ALL); @@ -191,7 +191,7 @@ void Guild::Rename(std::string& newName) std::string escaped = m_Name; CharacterDatabase.escape_string(escaped); - CharacterDatabase.PExecute("UPDATE guild SET name = '%s' WHERE guildid = '%u'", escaped.c_str(), m_Id); + CharacterDatabase.PExecute("UPDATE `guild` SET `name` = '%s' WHERE `guildid` = '%u'", escaped.c_str(), m_Id); } GuildAddStatus Guild::AddMember(ObjectGuid plGuid, uint32 plRank) @@ -260,7 +260,7 @@ GuildAddStatus Guild::AddMember(ObjectGuid plGuid, uint32 plRank) CharacterDatabase.escape_string(dbPnote); CharacterDatabase.escape_string(dbOFFnote); - CharacterDatabase.PExecute("INSERT INTO guild_member (guildid,guid,rank,pnote,offnote) VALUES ('%u', '%u', '%u','%s','%s')", + CharacterDatabase.PExecute("INSERT INTO `guild_member` (`guildid`, `guid`, `rank`, `pnote`, `offnote`) VALUES ('%u', '%u', '%u','%s','%s')", m_Id, lowguid, newmember.RankId, dbPnote.c_str(), dbOFFnote.c_str()); // If player not in game data in data field will be loaded from guild tables, no need to update it!! @@ -282,7 +282,7 @@ void Guild::SetMOTD(std::string motd) // motd now can be used for encoding to DB CharacterDatabase.escape_string(motd); - CharacterDatabase.PExecute("UPDATE guild SET motd='%s' WHERE guildid='%u'", motd.c_str(), m_Id); + CharacterDatabase.PExecute("UPDATE `guild` SET `motd`='%s' WHERE `guildid`='%u'", motd.c_str(), m_Id); } void Guild::SetGINFO(std::string ginfo) @@ -291,7 +291,7 @@ void Guild::SetGINFO(std::string ginfo) // ginfo now can be used for encoding to DB CharacterDatabase.escape_string(ginfo); - CharacterDatabase.PExecute("UPDATE guild SET info='%s' WHERE guildid='%u'", ginfo.c_str(), m_Id); + CharacterDatabase.PExecute("UPDATE `guild` SET `info`='%s' WHERE `guildid`='%u'", ginfo.c_str(), m_Id); } bool Guild::LoadGuildFromDB(QueryResult* guildDataResult) @@ -378,7 +378,7 @@ bool Guild::LoadRanksFromDB(QueryResult* guildRanksResult) { //there is in table guild_rank record which doesn't have guildid in guild table, report error sLog.outErrorDb("Guild %u does not exist but it has a record in guild_rank table, deleting it!", guildId); - CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid = '%u'", guildId); + CharacterDatabase.PExecute("DELETE FROM `guild_rank` WHERE `guildid` = '%u'", guildId); continue; } @@ -412,13 +412,13 @@ bool Guild::LoadRanksFromDB(QueryResult* guildRanksResult) { sLog.outError("Guild %u has broken `guild_rank` data, repairing...", m_Id); CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid='%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `guild_rank` WHERE `guildid`='%u'", m_Id); for (size_t i = 0; i < m_Ranks.size(); ++i) { std::string name = m_Ranks[i].Name; uint32 rights = m_Ranks[i].Rights; CharacterDatabase.escape_string(name); - CharacterDatabase.PExecute("INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", m_Id, uint32(i), name.c_str(), rights); + CharacterDatabase.PExecute("INSERT INTO `guild_rank` (`guildid`, `rid`, `rname`, `rights`) VALUES ('%u', '%u', '%s', '%u')", m_Id, uint32(i), name.c_str(), rights); } CharacterDatabase.CommitTransaction(); } @@ -442,7 +442,7 @@ bool Guild::LoadMembersFromDB(QueryResult* guildMembersResult) { // there is in table guild_member record which doesn't have guildid in guild table, report error sLog.outErrorDb("Guild %u does not exist but it has a record in guild_member table, deleting it!", guildId); - CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guildid = '%u'", guildId); + CharacterDatabase.PExecute("DELETE FROM `guild_member` WHERE `guildid` = '%u'", guildId); continue; } @@ -472,7 +472,7 @@ bool Guild::LoadMembersFromDB(QueryResult* guildMembersResult) if (newmember.Level < 1 || newmember.Level > PLAYER_STRONG_MAX_LEVEL) // can be at broken `data` field { sLog.outError("%s has a broken data in field `characters`.`data`, deleting him from guild!", newmember.guid.GetString().c_str()); - CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `guild_member` WHERE `guid` = '%u'", lowguid); continue; } if (!newmember.ZoneId) @@ -485,7 +485,7 @@ bool Guild::LoadMembersFromDB(QueryResult* guildMembersResult) if (!((1 << (newmember.Class - 1)) & CLASSMASK_ALL_PLAYABLE)) // can be at broken `class` field { sLog.outError("%s has a broken data in field `characters`.`class`, deleting him from guild!", newmember.guid.GetString().c_str()); - CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `guild_member` WHERE `guid` = '%u'", lowguid); continue; } @@ -512,7 +512,7 @@ void Guild::SetLeader(ObjectGuid guid) m_LeaderGuid = guid; slot->ChangeRank(GR_GUILDMASTER); - CharacterDatabase.PExecute("UPDATE guild SET leaderguid='%u' WHERE guildid='%u'", guid.GetCounter(), m_Id); + CharacterDatabase.PExecute("UPDATE `guild` SET `leaderguid`='%u' WHERE `guildid`='%u'", guid.GetCounter(), m_Id); } /** @@ -577,7 +577,7 @@ bool Guild::DelMember(ObjectGuid guid, bool isDisbanding) player->SetRank(0); } - CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `guild_member` WHERE `guid` = '%u'", lowguid); if (!isDisbanding) UpdateAccountsNumber(); @@ -668,7 +668,7 @@ void Guild::CreateRank(std::string name_, uint32 rights) // name now can be used for encoding to DB CharacterDatabase.escape_string(name_); - CharacterDatabase.PExecute("INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", m_Id, new_rank_id, name_.c_str(), rights); + CharacterDatabase.PExecute("INSERT INTO `guild_rank` (`guildid`, `rid`, `rname`, `rights`) VALUES ('%u', '%u', '%s', '%u')", m_Id, new_rank_id, name_.c_str(), rights); } void Guild::AddRank(std::string const& name_, uint32 rights) @@ -684,7 +684,7 @@ void Guild::DelRank() // delete lowest guild_rank uint32 rank = GetLowestRank(); - CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE rid>='%u' AND guildid='%u'", rank, m_Id); + CharacterDatabase.PExecute("DELETE FROM `guild_rank` WHERE `rid`>='%u' AND `guildid`='%u'", rank, m_Id); m_Ranks.pop_back(); } @@ -714,7 +714,7 @@ void Guild::SetRankName(uint32 rankId, std::string name_) // name now can be used for encoding to DB CharacterDatabase.escape_string(name_); - CharacterDatabase.PExecute("UPDATE guild_rank SET rname='%s' WHERE rid='%u' AND guildid='%u'", name_.c_str(), rankId, m_Id); + CharacterDatabase.PExecute("UPDATE `guild_rank` SET `rname`='%s' WHERE `rid`='%u' AND `guildid`='%u'", name_.c_str(), rankId, m_Id); } void Guild::SetRankRights(uint32 rankId, uint32 rights) @@ -724,7 +724,7 @@ void Guild::SetRankRights(uint32 rankId, uint32 rights) m_Ranks[rankId].Rights = rights; - CharacterDatabase.PExecute("UPDATE guild_rank SET rights='%u' WHERE rid='%u' AND guildid='%u'", rights, rankId, m_Id); + CharacterDatabase.PExecute("UPDATE `guild_rank` SET `rights`='%u' WHERE `rid`='%u' AND `guildid`='%u'", rights, rankId, m_Id); } /** @@ -743,9 +743,9 @@ void Guild::Disband() } CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM guild WHERE guildid = '%u'", m_Id); - CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid = '%u'", m_Id); - CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE guildid = '%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `guild` WHERE `guildid` = '%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `guild_rank` WHERE `guildid` = '%u'", m_Id); + CharacterDatabase.PExecute("DELETE FROM `guild_eventlog` WHERE `guildid` = '%u'", m_Id); CharacterDatabase.CommitTransaction(); sGuildMgr.RemoveGuild(m_Id); } @@ -842,7 +842,7 @@ void Guild::SetEmblem(uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle m_BorderColor = borderColor; m_BackgroundColor = backgroundColor; - CharacterDatabase.PExecute("UPDATE guild SET EmblemStyle=%u, EmblemColor=%u, BorderStyle=%u, BorderColor=%u, BackgroundColor=%u WHERE guildid = %u", m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_Id); + CharacterDatabase.PExecute("UPDATE `guild` SET `EmblemStyle`=%u, `EmblemColor`=%u, `BorderStyle`=%u, `BorderColor`=%u, `BackgroundColor`=%u WHERE `guildid` = %u", m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_Id); } /** @@ -877,8 +877,8 @@ void Guild::DisplayGuildEventLog(WorldSession* session) // Load guild eventlog from DB void Guild::LoadGuildEventLogFromDB() { - // 0 1 2 3 4 5 - QueryResult* result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp FROM guild_eventlog WHERE guildid=%u ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_EVENTLOG_MAX_RECORDS); + // 0 1 2 3 4 5 + QueryResult* result = CharacterDatabase.PQuery("SELECT `LogGuid`, `EventType`, `PlayerGuid1`, `PlayerGuid2`, `NewRank`, `TimeStamp` FROM `guild_eventlog` WHERE `guildid`=%u ORDER BY `TimeStamp` DESC,`LogGuid` DESC LIMIT %u", m_Id, GUILD_EVENTLOG_MAX_RECORDS); if (!result) return; bool isNextLogGuidSet = false; @@ -930,8 +930,8 @@ void Guild::LogGuildEvent(uint8 EventType, ObjectGuid playerGuid1, ObjectGuid pl // Add event to list m_GuildEventLog.push_back(NewEvent); // Save event to DB - CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE guildid='%u' AND LogGuid='%u'", m_Id, m_GuildEventLogNextGuid); - CharacterDatabase.PExecute("INSERT INTO guild_eventlog (guildid, LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp) VALUES ('%u','%u','%u','%u','%u','%u','" UI64FMTD "')", + CharacterDatabase.PExecute("DELETE FROM `guild_eventlog` WHERE `guildid`='%u' AND `LogGuid`='%u'", m_Id, m_GuildEventLogNextGuid); + CharacterDatabase.PExecute("INSERT INTO `guild_eventlog` (`guildid`, `LogGuid`, `EventType`, `PlayerGuid1`, `PlayerGuid2`, `NewRank`, `TimeStamp`) VALUES ('%u','%u','%u','%u','%u','%u','" UI64FMTD "')", m_Id, m_GuildEventLogNextGuid, uint32(NewEvent.EventType), NewEvent.PlayerGuid1, NewEvent.PlayerGuid2, uint32(NewEvent.NewRank), NewEvent.TimeStamp); } diff --git a/src/game/Guild/GuildMgr.cpp b/src/game/Guild/GuildMgr.cpp index 8ce21273f..d88b41ecf 100644 --- a/src/game/Guild/GuildMgr.cpp +++ b/src/game/Guild/GuildMgr.cpp @@ -105,10 +105,10 @@ void GuildMgr::LoadGuilds() { uint32 count = 0; - // 0 1 2 3 4 5 6 - QueryResult* result = CharacterDatabase.Query("SELECT guild.guildid,guild.name,leaderguid,EmblemStyle,EmblemColor,BorderStyle,BorderColor," - // 7 8 9 10 - "BackgroundColor,info,motd,createdate FROM guild ORDER BY guildid ASC"); + // 0 1 2 3 4 5 6 + QueryResult* result = CharacterDatabase.Query("SELECT `guild`.`guildid`, `guild`.`name`, `leaderguid`, `EmblemStyle`, `EmblemColor`, `BorderStyle`, `BorderColor`," + // 7 8 9 10 + "`BackgroundColor`, `info`, `motd`, `createdate` FROM `guild` ORDER BY `guildid` ASC"); if (!result) { @@ -122,15 +122,15 @@ void GuildMgr::LoadGuilds() } // load guild ranks - // 0 1 2 3 - QueryResult* guildRanksResult = CharacterDatabase.Query("SELECT guildid,rid,rname,rights FROM guild_rank ORDER BY guildid ASC, rid ASC"); + // 0 1 2 3 + QueryResult* guildRanksResult = CharacterDatabase.Query("SELECT `guildid`, `rid`, `rname`, `rights` FROM `guild_rank` ORDER BY `guildid` ASC, `rid` ASC"); // load guild members - // 0 1 2 3 4 - QueryResult* guildMembersResult = CharacterDatabase.Query("SELECT guildid,guild_member.guid,rank,pnote,offnote," - // 5 6 7 8 9 10 - "characters.name, characters.level, characters.class, characters.zone, characters.logout_time, characters.account " - "FROM guild_member LEFT JOIN characters ON characters.guid = guild_member.guid ORDER BY guildid ASC"); + // 0 1 2 3 4 + QueryResult* guildMembersResult = CharacterDatabase.Query("SELECT `guildid`, `guild_member`.`guid`, `rank`, `pnote`, `offnote`," + // 5 6 7 8 9 10 + "`characters`.`name`, `characters`.`level`, `characters`.`class`, `characters`.`zone`, `characters`.`logout_time`, `characters`.`account` " + "FROM `guild_member` LEFT JOIN `characters` ON `characters`.`guid` = `guild_member`.`guid` ORDER BY `guildid` ASC"); BarGoLink bar(result->GetRowCount()); @@ -163,7 +163,7 @@ void GuildMgr::LoadGuilds() //delete unused LogGuid records in guild_eventlog table //you can comment these lines if you don't plan to change CONFIG_UINT32_GUILD_EVENT_LOG_COUNT - CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE LogGuid > '%u'", sWorld.getConfig(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT)); + CharacterDatabase.PExecute("DELETE FROM `guild_eventlog` WHERE `LogGuid` > '%u'", sWorld.getConfig(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT)); sLog.outString(); sLog.outString(">> Loaded %u guild definitions", count); @@ -174,8 +174,8 @@ void GuildMgr::LoadPetitions() CleanUpPetitions(); // for reload uint32 count = 0; - // 0 1 2 3 - QueryResult* result = CharacterDatabase.Query("SELECT ownerguid, petitionguid, charterguid, name FROM petition"); + // 0 1 2 3 + QueryResult* result = CharacterDatabase.Query("SELECT `ownerguid`, `petitionguid`, `charterguid`, `name` FROM `petition`"); if (!result) { @@ -189,8 +189,8 @@ void GuildMgr::LoadPetitions() } // load signatures - // 0 1 2 3 - QueryResult* petitionSignatures = CharacterDatabase.Query("SELECT ownerguid, petitionguid, playerguid, player_account FROM petition_sign"); + // 0 1 2 3 + QueryResult* petitionSignatures = CharacterDatabase.Query("SELECT `ownerguid`, `petitionguid`, `playerguid`, `player_account` FROM `petition_sign`"); BarGoLink bar(result->GetRowCount()); @@ -228,14 +228,14 @@ void GuildMgr::LoadPetitions() { // Signatures for a petition that does not exist. Delete it sLog.outErrorDb("Signatures exist for petition %u that does not exist", petitionId); - CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE petitionguid = '%u'", petitionId); + CharacterDatabase.PExecute("DELETE FROM `petition_sign` WHERE `petitionguid` = '%u'", petitionId); continue; } if (ownerGuid != petition->GetOwnerGuid()) { sLog.outErrorDb("Signatures exist for petition %u with a different owner, updating", petitionId); - CharacterDatabase.PExecute("UPDATE petition_sign SET ownerguid = '%u' WHERE petitionguid = '%u'", + CharacterDatabase.PExecute("UPDATE `petition_sign` SET `ownerguid` = '%u' WHERE `petitionguid` = '%u'", petition->GetOwnerGuid().GetCounter(), petition->GetId()); ownerGuid = petition->GetOwnerGuid(); @@ -342,8 +342,8 @@ void Petition::Delete() if (m_id) { CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM petition WHERE petitionguid = '%u'", m_id); - CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE petitionguid = '%u'", m_id); + CharacterDatabase.PExecute("DELETE FROM `petition` WHERE `petitionguid` = '%u'", m_id); + CharacterDatabase.PExecute("DELETE FROM `petition_sign` WHERE `petitionguid` = '%u'", m_id); CharacterDatabase.CommitTransaction(); } } @@ -361,7 +361,7 @@ bool Petition::Rename(std::string& newname) { std::string db_newname = newname; CharacterDatabase.escape_string(db_newname); - CharacterDatabase.PExecute("UPDATE petition SET name = '%s' WHERE petitionguid = '%u'", + CharacterDatabase.PExecute("UPDATE `petition` SET `name` = '%s' WHERE `petitionguid` = '%u'", db_newname.c_str(), m_id); DEBUG_LOG("Petition %u renamed to '%s'", m_id, newname.c_str()); @@ -375,7 +375,7 @@ void Petition::SaveToDB() { std::string escaped_name = m_name; CharacterDatabase.escape_string(escaped_name); - CharacterDatabase.PExecute("INSERT INTO petition (ownerguid, petitionguid, charterguid, name) VALUES ('%u', '%u', '%u', '%s')", + CharacterDatabase.PExecute("INSERT INTO `petition` (`ownerguid`, `petitionguid`, `charterguid`, `name`) VALUES ('%u', '%u', '%u', '%s')", m_ownerGuid.GetCounter(), m_id, m_charterGuid.GetCounter(), escaped_name.c_str()); } @@ -442,6 +442,6 @@ PetitionSignature::PetitionSignature(Petition* petition, Player* player) void PetitionSignature::SaveToDB() { - CharacterDatabase.PExecute("INSERT INTO petition_sign (ownerguid, petitionguid, playerguid, player_account) VALUES ('%u', '%u', '%u','%u')", + CharacterDatabase.PExecute("INSERT INTO `petition_sign` (`ownerguid`, `petitionguid`, `playerguid`, `player_account`) VALUES ('%u', '%u', '%u','%u')", m_petition->GetOwnerGuid().GetCounter(), m_petition->GetId(), m_playerGuid.GetCounter(), m_playerAccount); } diff --git a/src/game/Handlers/GMTicketHandler.cpp b/src/game/Handlers/GMTicketHandler.cpp index 7d45ff4f5..32de0e254 100644 --- a/src/game/Handlers/GMTicketHandler.cpp +++ b/src/game/Handlers/GMTicketHandler.cpp @@ -180,7 +180,7 @@ void WorldSession::HandleGMSurveySubmitOpcode(WorldPacket& recvData) continue; static SqlStatementID insSubSurvey; - SqlStatement stmt = CharacterDatabase.CreateStatement(insSubSurvey, "INSERT INTO gm_subsurveys (surveyId, subsurveyId, rank, comment) VALUES (?, ?, ?, ?)"); + SqlStatement stmt = CharacterDatabase.CreateStatement(insSubSurvey, "INSERT INTO `gm_subsurveys` (`surveyId`, `subsurveyId`, `rank`, `comment`) VALUES (?, ?, ?, ?)"); stmt.addUInt32(nextSurveyID); stmt.addUInt32(subSurveyId); stmt.addUInt32(rank); @@ -192,7 +192,7 @@ void WorldSession::HandleGMSurveySubmitOpcode(WorldPacket& recvData) recvData >> comment; static SqlStatementID insSurvey; - SqlStatement stmt = CharacterDatabase.CreateStatement(insSurvey, "INSERT INTO gm_surveys (guid, surveyId, mainSurvey, overallComment, createTime) VALUES (?, ?, ?, ?, UNIX_TIMESTAMP(NOW()))"); + SqlStatement stmt = CharacterDatabase.CreateStatement(insSurvey, "INSERT INTO `gm_surveys` (`guid`, `surveyId`, `mainSurvey`, `overallComment`, `createTime`) VALUES (?, ?, ?, ?, UNIX_TIMESTAMP(NOW()))"); stmt.addUInt32(GetPlayer()->GetGUIDLow()); stmt.addUInt32(nextSurveyID); stmt.addUInt32(mainSurvey); diff --git a/src/game/Maps/MapPersistentStateMgr.cpp b/src/game/Maps/MapPersistentStateMgr.cpp index 1545e8925..2a75bea5b 100644 --- a/src/game/Maps/MapPersistentStateMgr.cpp +++ b/src/game/Maps/MapPersistentStateMgr.cpp @@ -88,12 +88,12 @@ void MapPersistentState::SaveCreatureRespawnTime(uint32 loguid, time_t t) if (t > sWorld.GetGameTime()) { - SqlStatement stmt = CharacterDatabase.CreateStatement(replSpawnTime, "REPLACE INTO creature_respawn (guid, respawntime, instance, map) VALUES ( ?, ?, ?, ?)"); + SqlStatement stmt = CharacterDatabase.CreateStatement(replSpawnTime, "REPLACE INTO `creature_respawn` (`guid`, `respawntime`, `instance`, `map`) VALUES ( ?, ?, ?, ?)"); stmt.PExecute(loguid, uint64(t), m_instanceid, GetMapId()); } else { - SqlStatement stmt = CharacterDatabase.CreateStatement(delSpawnTime, "DELETE FROM creature_respawn WHERE guid = ? AND instance = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delSpawnTime, "DELETE FROM `creature_respawn` WHERE `guid` = ? AND `instance` = ?"); stmt.PExecute(loguid, m_instanceid); } } @@ -110,12 +110,12 @@ void MapPersistentState::SaveGORespawnTime(uint32 loguid, time_t t) if (t > sWorld.GetGameTime()) { - SqlStatement stmt = CharacterDatabase.CreateStatement(replSpawnTime, "REPLACE INTO gameobject_respawn (guid, respawntime, instance, map) VALUES ( ?, ?, ?, ?)"); + SqlStatement stmt = CharacterDatabase.CreateStatement(replSpawnTime, "REPLACE INTO `gameobject_respawn` (`guid`, `respawntime`, `instance`, `map`) VALUES ( ?, ?, ?, ?)"); stmt.PExecute(loguid, uint64(t), m_instanceid, GetMapId()); } else { - SqlStatement stmt = CharacterDatabase.CreateStatement(delSpawnTime, "DELETE FROM gameobject_respawn WHERE guid = ? AND instance = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delSpawnTime, "DELETE FROM `gameobject_respawn` WHERE `guid` = ? AND `instance` = ?"); stmt.PExecute(loguid, m_instanceid); } } @@ -256,15 +256,15 @@ void DungeonPersistentState::SaveToDB() } } - CharacterDatabase.PExecute("INSERT INTO instance VALUES ('%u', '%u', '" UI64FMTD "', '%s')", GetInstanceId(), GetMapId(), (uint64)GetResetTimeForDB(), data.c_str()); + CharacterDatabase.PExecute("INSERT INTO `instance` VALUES ('%u', '%u', '" UI64FMTD "', '%s')", GetInstanceId(), GetMapId(), (uint64)GetResetTimeForDB(), data.c_str()); } void DungeonPersistentState::DeleteRespawnTimesAndData() { CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM creature_respawn WHERE instance = '%u'", GetInstanceId()); - CharacterDatabase.PExecute("DELETE FROM gameobject_respawn WHERE instance = '%u'", GetInstanceId()); - CharacterDatabase.PExecute("UPDATE instance SET data = '' WHERE id = '%u'", GetInstanceId()); + CharacterDatabase.PExecute("DELETE FROM `creature_respawn` WHERE `instance` = '%u'", GetInstanceId()); + CharacterDatabase.PExecute("DELETE FROM `gameobject_respawn` WHERE `instance` = '%u'", GetInstanceId()); + CharacterDatabase.PExecute("UPDATE `instance` SET `data` = '' WHERE `id` = '%u'", GetInstanceId()); CharacterDatabase.CommitTransaction(); ClearRespawnTimes(); // state can be deleted at call if only respawn data prevent unload @@ -329,7 +329,7 @@ void DungeonResetScheduler::LoadResetTimes() // _____BAD_____ ResetTimeMapType InstResetTime; - QueryResult* result = CharacterDatabase.Query("SELECT id, map, resettime FROM instance"); + QueryResult* result = CharacterDatabase.Query("SELECT `id`, `map`, `resettime` FROM `instance`"); if (result) { do @@ -358,7 +358,7 @@ void DungeonResetScheduler::LoadResetTimes() delete result; // update reset time for normal instances with the max creature respawn time + X hours - result = CharacterDatabase.Query("SELECT MAX(respawntime), instance FROM creature_respawn WHERE instance > 0 GROUP BY instance"); + result = CharacterDatabase.Query("SELECT MAX(`respawntime`), `instance` FROM `creature_respawn` WHERE `instance` > 0 GROUP BY `instance`"); if (result) { do @@ -369,7 +369,7 @@ void DungeonResetScheduler::LoadResetTimes() ResetTimeMapType::iterator itr = InstResetTime.find(instance); if (itr != InstResetTime.end() && itr->second.second != resettime) { - CharacterDatabase.DirectPExecute("UPDATE instance SET resettime = '" UI64FMTD "' WHERE id = '%u'", uint64(resettime), instance); + CharacterDatabase.DirectPExecute("UPDATE `instance` SET `resettime` = '" UI64FMTD "' WHERE `id` = '%u'", uint64(resettime), instance); itr->second.second = resettime; } } @@ -381,7 +381,7 @@ void DungeonResetScheduler::LoadResetTimes() // load the global respawn times for raid instances uint32 diff = sWorld.getConfig(CONFIG_UINT32_INSTANCE_RESET_TIME_HOUR) * HOUR; m_resetTimeByMapId.resize(sMapStorage.GetMaxEntry() + 1); - result = CharacterDatabase.Query("SELECT mapid, resettime FROM instance_reset"); + result = CharacterDatabase.Query("SELECT `mapid`, `resettime` FROM `instance_reset`"); if (result) { do @@ -394,7 +394,7 @@ void DungeonResetScheduler::LoadResetTimes() if (!mapEntry || !mapEntry->IsDungeon()) { sLog.outError("MapPersistentStateManager::LoadResetTimes: invalid mapid %u in instance_reset!", mapid); - CharacterDatabase.DirectPExecute("DELETE FROM instance_reset WHERE mapid = '%u'", mapid); + CharacterDatabase.DirectPExecute("DELETE FROM `instance_reset` WHERE `mapid` = '%u'", mapid); continue; } @@ -402,7 +402,7 @@ void DungeonResetScheduler::LoadResetTimes() uint64 oldresettime = fields[1].GetUInt64(); uint64 newresettime = (oldresettime / DAY) * DAY + diff; if (oldresettime != newresettime) - CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u'", newresettime, mapid); + CharacterDatabase.DirectPExecute("UPDATE `instance_reset` SET `resettime` = '" UI64FMTD "' WHERE `mapid` = '%u'", newresettime, mapid); SetResetTimeFor(mapid, newresettime); } @@ -425,7 +425,7 @@ void DungeonResetScheduler::ScheduleAllDungeonResets() // Reset times have already been updated and set in LoadResetTimes(). We just need to start // the initial reset events based on them. Since LoadResetTimes() is called before // PackInstances(), it cannot be done there. - QueryResult* result = CharacterDatabase.Query("SELECT id, map, resettime FROM instance"); + QueryResult* result = CharacterDatabase.Query("SELECT `id`, `map`, `resettime` FROM `instance`"); if (result) { do @@ -468,7 +468,7 @@ void DungeonResetScheduler::ScheduleAllDungeonResets() { // initialize the reset time t = today + period + diff; - CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u','" UI64FMTD "')", itr->id, (uint64)t); + CharacterDatabase.DirectPExecute("INSERT INTO `instance_reset` VALUES ('%u','" UI64FMTD "')", itr->id, (uint64)t); } if (t < now) @@ -477,7 +477,7 @@ void DungeonResetScheduler::ScheduleAllDungeonResets() // calculate the next reset time t = (t / DAY) * DAY; t += ((today - t) / period + 1) * period + diff; - CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u'", (uint64)t, itr->id); + CharacterDatabase.DirectPExecute("UPDATE `instance_reset` SET `resettime` = '" UI64FMTD "' WHERE `mapid` = '%u'", (uint64)t, itr->id); } SetResetTimeFor(itr->id, t); @@ -567,7 +567,7 @@ void DungeonResetScheduler::Update() time_t next_reset = DungeonResetScheduler::CalculateNextResetTime(instanceTemplate, resetTime); - CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u'", uint64(next_reset), uint32(event.mapid)); + CharacterDatabase.DirectPExecute("UPDATE `instance_reset` SET `resettime` = '" UI64FMTD "' WHERE `mapid` = '%u'", uint64(next_reset), uint32(event.mapid)); SetResetTimeFor(event.mapid, next_reset); @@ -703,11 +703,11 @@ void MapPersistentStateManager::DeleteInstanceFromDB(uint32 mapid, uint32 instan if (instanceid) { CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM instance WHERE id = '%u'", instanceid); - CharacterDatabase.PExecute("DELETE FROM character_instance WHERE instance = '%u'", instanceid); - CharacterDatabase.PExecute("DELETE FROM group_instance WHERE instance = '%u'", instanceid); - CharacterDatabase.PExecute("DELETE FROM creature_respawn WHERE instance = '%u'", instanceid); - CharacterDatabase.PExecute("DELETE FROM gameobject_respawn WHERE instance = '%u'", instanceid); + CharacterDatabase.PExecute("DELETE FROM `instance` WHERE `id` = '%u'", instanceid); + CharacterDatabase.PExecute("DELETE FROM `character_instance` WHERE `instance` = '%u'", instanceid); + CharacterDatabase.PExecute("DELETE FROM `group_instance` WHERE `instance` = '%u'", instanceid); + CharacterDatabase.PExecute("DELETE FROM `creature_respawn` WHERE `instance` = '%u'", instanceid); + CharacterDatabase.PExecute("DELETE FROM `gameobject_respawn` WHERE `instance` = '%u'", instanceid); CharacterDatabase.CommitTransaction(); } } @@ -783,8 +783,8 @@ void MapPersistentStateManager::CleanupInstances() _DelHelper(CharacterDatabase, "group_instance.leaderGuid, instance", "group_instance", "LEFT JOIN instance ON group_instance.instance = instance.id WHERE instance.id IS NULL"); // clean unused respawn data - CharacterDatabase.PExecute("DELETE FROM creature_respawn WHERE instance >= %u AND instance NOT IN (SELECT id FROM instance)", RESERVED_INSTANCES_LAST); - CharacterDatabase.PExecute("DELETE FROM gameobject_respawn WHERE instance >= %u AND instance NOT IN (SELECT id FROM instance)", RESERVED_INSTANCES_LAST); + CharacterDatabase.PExecute("DELETE FROM `creature_respawn` WHERE `instance` >= %u AND `instance` NOT IN (SELECT `id` FROM `instance`)", RESERVED_INSTANCES_LAST); + CharacterDatabase.PExecute("DELETE FROM `gameobject_respawn` WHERE `instance` >= %u AND `instance` NOT IN (SELECT `id` FROM `instance`)", RESERVED_INSTANCES_LAST); //execute transaction directly CharacterDatabase.CommitTransaction(); @@ -805,15 +805,15 @@ void MapPersistentStateManager::PackInstances() // any associations to ids not in this table are assumed to be // cleaned already in CleanupInstances CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("UPDATE instance SET id = id + %u ORDER BY id DESC", RESERVED_INSTANCES_LAST); - CharacterDatabase.PExecute("UPDATE creature_respawn SET instance = instance + %u WHERE instance >= %u ORDER BY instance DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); - CharacterDatabase.PExecute("UPDATE gameobject_respawn SET instance = instance + %u WHERE instance >= %u ORDER BY instance DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); - CharacterDatabase.PExecute("UPDATE corpse SET instance = instance + %u WHERE instance >= 0 ORDER BY instance DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); - CharacterDatabase.PExecute("UPDATE character_instance SET instance = instance + %u WHERE instance >= 0 ORDER BY instance DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); - CharacterDatabase.PExecute("UPDATE group_instance SET instance = instance + %u WHERE instance >= 0 ORDER BY instance DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); - CharacterDatabase.Execute("DELETE FROM instance WHERE map <= 1"); + CharacterDatabase.PExecute("UPDATE `instance` SET `id` = `id` + %u ORDER BY `id` DESC", RESERVED_INSTANCES_LAST); + CharacterDatabase.PExecute("UPDATE `creature_respawn` SET `instance` = `instance` + %u WHERE `instance` >= %u ORDER BY `instance` DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); + CharacterDatabase.PExecute("UPDATE `gameobject_respawn` SET `instance` = `instance` + %u WHERE `instance` >= %u ORDER BY `instance` DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); + CharacterDatabase.PExecute("UPDATE `corpse` SET `instance` = `instance` + %u WHERE `instance` >= 0 ORDER BY `instance` DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); + CharacterDatabase.PExecute("UPDATE `character_instance` SET `instance` = `instance` + %u WHERE `instance` >= 0 ORDER BY `instance` DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); + CharacterDatabase.PExecute("UPDATE `group_instance` SET `instance` = `instance` + %u WHERE `instance` >= 0 ORDER BY `instance` DESC", RESERVED_INSTANCES_LAST, RESERVED_INSTANCES_LAST); + CharacterDatabase.Execute("DELETE FROM `instance` WHERE `map` <= 1"); CharacterDatabase.CommitTransaction(); - QueryResult* result = CharacterDatabase.Query("SELECT id FROM instance"); + QueryResult* result = CharacterDatabase.Query("SELECT `id` FROM `instance`"); if (result) { do @@ -836,12 +836,12 @@ void MapPersistentStateManager::PackInstances() { CharacterDatabase.BeginTransaction(); // remap instance id - CharacterDatabase.PExecute("UPDATE creature_respawn SET instance = '%u' WHERE instance = '%u'", InstanceNumber, i); - CharacterDatabase.PExecute("UPDATE gameobject_respawn SET instance = '%u' WHERE instance = '%u'", InstanceNumber, i); - CharacterDatabase.PExecute("UPDATE corpse SET instance = '%u' WHERE instance = '%u'", InstanceNumber, i); - CharacterDatabase.PExecute("UPDATE character_instance SET instance = '%u' WHERE instance = '%u'", InstanceNumber, i); - CharacterDatabase.PExecute("UPDATE instance SET id = '%u' WHERE id = '%u'", InstanceNumber, i); - CharacterDatabase.PExecute("UPDATE group_instance SET instance = '%u' WHERE instance = '%u'", InstanceNumber, i); + CharacterDatabase.PExecute("UPDATE `creature_respawn` SET `instance` = '%u' WHERE `instance` = '%u'", InstanceNumber, i); + CharacterDatabase.PExecute("UPDATE `gameobject_respawn` SET `instance` = '%u' WHERE `instance` = '%u'", InstanceNumber, i); + CharacterDatabase.PExecute("UPDATE `corpse` SET `instance` = '%u' WHERE `instance` = '%u'", InstanceNumber, i); + CharacterDatabase.PExecute("UPDATE `character_instance` SET `instance` = '%u' WHERE `instance` = '%u'", InstanceNumber, i); + CharacterDatabase.PExecute("UPDATE `instance` SET `id` = '%u' WHERE `id` = '%u'", InstanceNumber, i); + CharacterDatabase.PExecute("UPDATE `group_instance` SET `instance` = '%u' WHERE `instance` = '%u'", InstanceNumber, i); //execute transaction synchronously CharacterDatabase.CommitTransaction(); } @@ -968,15 +968,15 @@ void MapPersistentStateManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 // delete them from the DB, even if not loaded CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM character_instance USING character_instance LEFT JOIN instance ON character_instance.instance = id WHERE map = '%u'", mapid); - CharacterDatabase.PExecute("DELETE FROM group_instance USING group_instance LEFT JOIN instance ON group_instance.instance = id WHERE map = '%u'", mapid); - CharacterDatabase.PExecute("DELETE FROM instance WHERE map = '%u'", mapid); + CharacterDatabase.PExecute("DELETE FROM `character_instance` USING `character_instance` LEFT JOIN `instance` ON `character_instance`.`instance` = `id` WHERE `map` = '%u'", mapid); + CharacterDatabase.PExecute("DELETE FROM `group_instance` USING `group_instance` LEFT JOIN `instance` ON `group_instance`.`instance` = `id` WHERE `map` = '%u'", mapid); + CharacterDatabase.PExecute("DELETE FROM `instance` WHERE `map` = '%u'", mapid); CharacterDatabase.CommitTransaction(); // calculate the next reset time time_t next_reset = DungeonResetScheduler::CalculateNextResetTime(mapEntry, now + timeLeft); // update it in the DB - CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '" UI64FMTD "' WHERE mapid = '%u'", (uint64)next_reset, mapid); + CharacterDatabase.PExecute("UPDATE `instance_reset` SET `resettime` = '" UI64FMTD "' WHERE `mapid` = '%u'", (uint64)next_reset, mapid); return; } @@ -1011,11 +1011,11 @@ void MapPersistentStateManager::_CleanupExpiredInstancesAtTime(time_t t) void MapPersistentStateManager::LoadCreatureRespawnTimes() { // remove outdated data - CharacterDatabase.DirectExecute("DELETE FROM creature_respawn WHERE respawntime <= UNIX_TIMESTAMP(NOW())"); + CharacterDatabase.DirectExecute("DELETE FROM `creature_respawn` WHERE `respawntime` <= UNIX_TIMESTAMP(NOW())"); uint32 count = 0; - QueryResult* result = CharacterDatabase.Query("SELECT guid, respawntime, creature_respawn.map, instance, resettime FROM creature_respawn LEFT JOIN instance ON instance = id"); + QueryResult* result = CharacterDatabase.Query("SELECT `guid`, `respawntime`, `creature_respawn`.`map`, `instance`, `resettime` FROM `creature_respawn` LEFT JOIN `instance` ON `instance` = `id`"); if (!result) { BarGoLink bar(1); @@ -1092,11 +1092,11 @@ void MapPersistentStateManager::LoadCreatureRespawnTimes() void MapPersistentStateManager::LoadGameobjectRespawnTimes() { // remove outdated data - CharacterDatabase.DirectExecute("DELETE FROM gameobject_respawn WHERE respawntime <= UNIX_TIMESTAMP(NOW())"); + CharacterDatabase.DirectExecute("DELETE FROM `gameobject_respawn` WHERE `respawntime` <= UNIX_TIMESTAMP(NOW())"); uint32 count = 0; - QueryResult* result = CharacterDatabase.Query("SELECT guid, respawntime, gameobject_respawn.map, instance, resettime FROM gameobject_respawn LEFT JOIN instance ON instance = id"); + QueryResult* result = CharacterDatabase.Query("SELECT `guid`, `respawntime`, `gameobject_respawn`.`map`, `instance`, `resettime` FROM `gameobject_respawn` LEFT JOIN `instance` ON `instance` = id"); if (!result) { diff --git a/src/game/Movement/WaypointManager.cpp b/src/game/Movement/WaypointManager.cpp index 4cec6f844..c542c9dac 100644 --- a/src/game/Movement/WaypointManager.cpp +++ b/src/game/Movement/WaypointManager.cpp @@ -401,49 +401,49 @@ void WaypointManager::Load() void WaypointManager::Cleanup() { // check if points need to be renumbered and do it - if (QueryResult* result = WorldDatabase.Query("SELECT 1 from creature_movement As T WHERE point <> (SELECT COUNT(*) FROM creature_movement WHERE id = T.id AND point <= T.point) LIMIT 1")) + if (QueryResult* result = WorldDatabase.Query("SELECT 1 from `creature_movement` As T WHERE `point` <> (SELECT COUNT(*) FROM `creature_movement` WHERE `id` = T.`id` AND `point` <= T.`point`) LIMIT 1")) { delete result; - WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE temp LIKE creature_movement"); - WorldDatabase.DirectExecute("INSERT INTO temp SELECT * FROM creature_movement"); - WorldDatabase.DirectExecute("ALTER TABLE creature_movement DROP PRIMARY KEY"); - WorldDatabase.DirectExecute("UPDATE creature_movement AS T SET point = (SELECT COUNT(*) FROM temp WHERE id = T.id AND point <= T.point)"); - WorldDatabase.DirectExecute("ALTER TABLE creature_movement ADD PRIMARY KEY (id, point)"); - WorldDatabase.DirectExecute("DROP TABLE temp"); + WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE `temp` LIKE `creature_movement`"); + WorldDatabase.DirectExecute("INSERT INTO `temp` SELECT * FROM `creature_movement`"); + WorldDatabase.DirectExecute("ALTER TABLE `creature_movement` DROP PRIMARY KEY"); + WorldDatabase.DirectExecute("UPDATE `creature_movement` AS T SET `point` = (SELECT COUNT(*) FROM `temp` WHERE `id` = T.`id` AND `point` <= T.`point`)"); + WorldDatabase.DirectExecute("ALTER TABLE `creature_movement` ADD PRIMARY KEY (`id`, `point`)"); + WorldDatabase.DirectExecute("DROP TABLE `temp`"); sLog.outErrorDb("Table `creature_movement` was auto corrected for using points out of order (invalid or points missing)"); - MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from creature_movement As T WHERE point <> (SELECT COUNT(*) FROM creature_movement WHERE id = T.id AND point <= T.point) LIMIT 1"))); + MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from `creature_movement` As T WHERE `point` <> (SELECT COUNT(*) FROM `creature_movement` WHERE `id` = T.`id` AND `point` <= T.`point`) LIMIT 1"))); } - if (QueryResult* result = WorldDatabase.Query("SELECT 1 from creature_movement_template As T WHERE point <> (SELECT COUNT(*) FROM creature_movement_template WHERE entry = T.entry AND point <= T.point) LIMIT 1")) + if (QueryResult* result = WorldDatabase.Query("SELECT 1 from `creature_movement_template` As T WHERE `point` <> (SELECT COUNT(*) FROM `creature_movement_template` WHERE `entry` = T.`entry` AND `point` <= T.`point`) LIMIT 1")) { delete result; - WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE temp LIKE creature_movement_template"); - WorldDatabase.DirectExecute("INSERT INTO temp SELECT * FROM creature_movement_template"); - WorldDatabase.DirectExecute("ALTER TABLE creature_movement_template DROP PRIMARY KEY"); - WorldDatabase.DirectExecute("UPDATE creature_movement_template AS T SET point = (SELECT COUNT(*) FROM temp WHERE entry = T.entry AND point <= T.point)"); - WorldDatabase.DirectExecute("ALTER TABLE creature_movement_template ADD PRIMARY KEY (entry, point)"); - WorldDatabase.DirectExecute("DROP TABLE temp"); + WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE `temp` LIKE `creature_movement_template`"); + WorldDatabase.DirectExecute("INSERT INTO `temp` SELECT * FROM `creature_movement_template`"); + WorldDatabase.DirectExecute("ALTER TABLE `creature_movement_template` DROP PRIMARY KEY"); + WorldDatabase.DirectExecute("UPDATE `creature_movement_template` AS T SET `point` = (SELECT COUNT(*) FROM `temp` WHERE `entry` = T.`entry` AND `point` <= T.`point`)"); + WorldDatabase.DirectExecute("ALTER TABLE `creature_movement_template` ADD PRIMARY KEY (`entry`, `point`)"); + WorldDatabase.DirectExecute("DROP TABLE `temp`"); sLog.outErrorDb("Table `creature_movement_template` was auto corrected for using points out of order (invalid or points missing)"); - MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from creature_movement_template As T WHERE point <> (SELECT COUNT(*) FROM creature_movement_template WHERE entry = T.entry AND point <= T.point) LIMIT 1"))); + MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from `creature_movement_template` As T WHERE `point` <> (SELECT COUNT(*) FROM `creature_movement_template` WHERE `entry` = T.`entry` AND `point` <= T.`point`) LIMIT 1"))); } - if (QueryResult* result = WorldDatabase.Query("SELECT 1 from creature_movement_special As T WHERE point <> (SELECT COUNT(*) FROM creature_movement_special WHERE id = T.id AND point <= T.point) LIMIT 1")) + if (QueryResult* result = WorldDatabase.Query("SELECT 1 from `creature_movement_special` As T WHERE `point` <> (SELECT COUNT(*) FROM `creature_movement_special` WHERE `id` = T.`id` AND `point` <= T.`point`) LIMIT 1")) { delete result; - WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE temp LIKE creature_movement_special"); - WorldDatabase.DirectExecute("INSERT INTO temp SELECT * FROM creature_movement_special"); - WorldDatabase.DirectExecute("ALTER TABLE creature_movement_special DROP PRIMARY KEY"); - WorldDatabase.DirectExecute("UPDATE creature_movement_special AS T SET point = (SELECT COUNT(*) FROM temp WHERE id = T.id AND point <= T.point)"); - WorldDatabase.DirectExecute("ALTER TABLE creature_movement_special ADD PRIMARY KEY (id, point)"); - WorldDatabase.DirectExecute("DROP TABLE temp"); + WorldDatabase.DirectExecute("CREATE TEMPORARY TABLE `temp` LIKE `creature_movement_special`"); + WorldDatabase.DirectExecute("INSERT INTO `temp` SELECT * FROM `creature_movement_special`"); + WorldDatabase.DirectExecute("ALTER TABLE `creature_movement_special` DROP PRIMARY KEY"); + WorldDatabase.DirectExecute("UPDATE `creature_movement_special` AS T SET `point` = (SELECT COUNT(*) FROM `temp` WHERE `id` = T.`id` AND `point` <= T.`point`)"); + WorldDatabase.DirectExecute("ALTER TABLE `creature_movement_special` ADD PRIMARY KEY (`id`, `point`)"); + WorldDatabase.DirectExecute("DROP TABLE `temp`"); sLog.outErrorDb("Table `creature_movement_special` was auto corrected for using points out of order (invalid or points missing)"); - MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from creature_movement_special As T WHERE point <> (SELECT COUNT(*) FROM creature_movement_special WHERE id = T.id AND point <= T.point) LIMIT 1"))); + MANGOS_ASSERT(!(result = WorldDatabase.Query("SELECT 1 from `creature_movement_special` As T WHERE `point` <> (SELECT COUNT(*) FROM `creature_movement_special` WHERE `id` = T.`id` AND `point` <= T.`point`) LIMIT 1"))); } } diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 5f6bd8b0f..78bc81110 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -469,7 +469,7 @@ void ObjectMgr::LoadPlayerPhaseFromDb() { m_PlayerPhases.clear(); - std::unique_ptr result(CharacterDatabase.Query("SELECT guid, world_phase_mask FROM characters")); + std::unique_ptr result(CharacterDatabase.Query("SELECT `guid`, `world_phase_mask` FROM `characters`")); uint32 total_count = 0; diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp index dabebd097..ccb12acd5 100644 --- a/src/game/Objects/Player.cpp +++ b/src/game/Objects/Player.cpp @@ -3498,7 +3498,7 @@ bool Player::AddSpell(uint32 spell_id, bool active, bool learning, bool dependen if (!IsInWorld() && !learning) // spell load case { sLog.outError("Player::AddSpell: nonexistent in SpellStore spell #%u request, deleting for all characters in `character_spell`.", spell_id); - CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'", spell_id); + CharacterDatabase.PExecute("DELETE FROM `character_spell` WHERE `spell` = '%u'", spell_id); } else sLog.outError("Player::AddSpell: nonexistent in SpellStore spell #%u request.", spell_id); @@ -3512,7 +3512,7 @@ bool Player::AddSpell(uint32 spell_id, bool active, bool learning, bool dependen if (!IsInWorld() && !learning) // spell load case { sLog.outError("Player::AddSpell: Broken spell #%u learning not allowed, deleting for all characters in `character_spell`.", spell_id); - CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'", spell_id); + CharacterDatabase.PExecute("DELETE FROM `character_spell` WHERE `spell` = '%u'", spell_id); } else sLog.outError("Player::AddSpell: Broken spell #%u learning not allowed.", spell_id); @@ -4036,7 +4036,7 @@ void Player::_SaveSpellCooldowns() uint64 spellExpireTime = uint64(Clock::to_time_t(sTime)); uint64 catExpireTime = uint64(Clock::to_time_t(cTime)); - stmt = CharacterDatabase.CreateStatement(insertSpellCooldown, "INSERT INTO character_spell_cooldown (guid, SpellId, SpellExpireTime, Category, CategoryExpireTime, ItemId) VALUES( ?, ?, ?, ?, ?, ?)"); + stmt = CharacterDatabase.CreateStatement(insertSpellCooldown, "INSERT INTO `character_spell_cooldown` (`guid`, `SpellId`, `SpellExpireTime`, `Category`, `CategoryExpireTime`, `ItemId`) VALUES( ?, ?, ?, ?, ?, ?)"); stmt.addUInt32(GetGUIDLow()); stmt.addUInt32(cdData->GetSpellId()); stmt.addUInt64(spellExpireTime); @@ -4502,8 +4502,8 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe // completely remove from the database case 0: { - // return back all mails with COD and Item 0 1 2 3 4 5 6 7 - QueryResult* resultMail = CharacterDatabase.PQuery("SELECT id,messageType,mailTemplateId,sender,subject,itemTextId,money,has_items FROM mail WHERE receiver='%u' AND has_items<>0 AND cod<>0", lowguid); + // return back all mails with COD and Item 0 1 2 3 4 5 6 7 + QueryResult* resultMail = CharacterDatabase.PQuery("SELECT `id`, `messageType`, `mailTemplateId`, `sender`, `subject`, `itemTextId`, `money`, `has_items` FROM `mail` WHERE `receiver`='%u' AND `has_items`<>0 AND `cod`<>0", lowguid); if (resultMail) { do @@ -4521,13 +4521,13 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe //we can return mail now //so firstly delete the old one - CharacterDatabase.PExecute("DELETE FROM mail WHERE id = '%u'", mail_id); + CharacterDatabase.PExecute("DELETE FROM `mail` WHERE `id` = '%u'", mail_id); // mail not from player if (mailType != MAIL_NORMAL) { if (has_items) - CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mail_id); + CharacterDatabase.PExecute("DELETE FROM `mail_items` WHERE `mail_id` = '%u'", mail_id); continue; } @@ -4540,7 +4540,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe if (has_items) { // data needs to be at first place for Item::LoadFromDB - QueryResult* resultItems = CharacterDatabase.PQuery("SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyId, durability, text, item_guid, itemEntry, generated_loot FROM mail_items JOIN item_instance ON item_guid = guid WHERE mail_id='%u'", mail_id); + QueryResult* resultItems = CharacterDatabase.PQuery("SELECT `creatorGuid`, `giftCreatorGuid`, `count`, `duration`, `charges`, `flags`, `enchantments`, `randomPropertyId`, `durability`, `text`, `item_guid`, `itemEntry`, `generated_loot` FROM `mail_items` JOIN `item_instance` ON `item_guid` = `guid` WHERE `mail_id`='%u'", mail_id); if (resultItems) { do @@ -4553,7 +4553,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe ItemPrototype const* itemProto = ObjectMgr::GetItemPrototype(item_template); if (!itemProto) { - CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item_guidlow); + CharacterDatabase.PExecute("DELETE FROM `item_instance` WHERE `guid` = '%u'", item_guidlow); continue; } @@ -4573,7 +4573,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe } } - CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mail_id); + CharacterDatabase.PExecute("DELETE FROM `mail_items` WHERE `mail_id` = '%u'", mail_id); uint32 pl_account = sObjectMgr.GetPlayerAccountIdByGUID(playerguid); @@ -4586,7 +4586,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe // unsummon and delete for pets in world is not required: player deleted from CLI or character list with not loaded pet. // Get guids of character's pets, will deleted in transaction - QueryResult* resultPets = CharacterDatabase.PQuery("SELECT id FROM character_pet WHERE owner = '%u'", lowguid); + QueryResult* resultPets = CharacterDatabase.PQuery("SELECT `id` FROM `character_pet` WHERE `owner` = '%u'", lowguid); // NOW we can finally clear other DB data related to character CharacterDatabase.BeginTransaction(); @@ -4603,35 +4603,35 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe delete resultPets; } - CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_action WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_aura WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_battleground_data WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_deleted_items WHERE player_guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_gifts WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM group_instance WHERE leaderGuid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_queststatus WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_reputation WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_forgotten_skills WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_spell_cooldown WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_ticket WHERE guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM item_instance WHERE owner_guid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_social WHERE guid = '%u' OR friend='%u'", lowguid, lowguid); - CharacterDatabase.PExecute("DELETE FROM mail WHERE receiver = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM mail_items WHERE receiver = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE PlayerGuid1 = '%u' OR PlayerGuid2 = '%u'", lowguid, lowguid); + CharacterDatabase.PExecute("DELETE FROM `characters` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_action` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_aura` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_battleground_data` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_deleted_items` WHERE `player_guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_gifts` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_homebind` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_instance` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `group_instance` WHERE `leaderGuid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_inventory` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_queststatus` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_reputation` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_forgotten_skills` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_spell` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_spell_cooldown` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_ticket` WHERE `guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `item_instance` WHERE `owner_guid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_social` WHERE `guid` = '%u' OR `friend`='%u'", lowguid, lowguid); + CharacterDatabase.PExecute("DELETE FROM `mail` WHERE `receiver` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `mail_items` WHERE `receiver` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_pet` WHERE `owner` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `guild_eventlog` WHERE `PlayerGuid1` = '%u' OR `PlayerGuid2` = '%u'", lowguid, lowguid); CharacterDatabase.CommitTransaction(); break; } // The character gets unlinked from the account, the name gets freed up and appears as deleted ingame case 1: - CharacterDatabase.PExecute("UPDATE characters SET deleteInfos_Name=name, deleteInfos_Account=account, deleteDate='" UI64FMTD "', name='', account=0 WHERE guid=%u", uint64(time(nullptr)), lowguid); + CharacterDatabase.PExecute("UPDATE `characters` SET `deleteInfos_Name`=`name`, `deleteInfos_Account`=`account`, `deleteDate`='" UI64FMTD "', `name`='', `account`=0 WHERE `guid`=%u", uint64(time(nullptr)), lowguid); break; default: sLog.outError("Player::DeleteFromDB: Unsupported delete method: %u.", charDelete_method); @@ -4664,7 +4664,7 @@ void Player::DeleteOldCharacters() */ void Player::DeleteOldCharacters(uint32 keepDays) { - QueryResult* resultChars = CharacterDatabase.PQuery("SELECT guid, deleteInfos_Account FROM characters WHERE deleteDate IS NOT NULL AND deleteDate < '" UI64FMTD "' LIMIT 0,2", uint64(time(nullptr) - time_t(keepDays * DAY))); + QueryResult* resultChars = CharacterDatabase.PQuery("SELECT `guid`, `deleteInfos_Account` FROM `characters` WHERE `deleteDate` IS NOT NULL AND `deleteDate` < '" UI64FMTD "' LIMIT 0,2", uint64(time(nullptr) - time_t(keepDays * DAY))); if (resultChars) { do @@ -6613,7 +6613,7 @@ uint32 Player::GetGuildIdFromDB(ObjectGuid guid) { uint32 lowguid = guid.GetCounter(); - QueryResult* result = CharacterDatabase.PQuery("SELECT guildid FROM guild_member WHERE guid='%u'", lowguid); + QueryResult* result = CharacterDatabase.PQuery("SELECT `guildid` FROM `guild_member` WHERE `guid`='%u'", lowguid); if (!result) return 0; @@ -6624,7 +6624,7 @@ uint32 Player::GetGuildIdFromDB(ObjectGuid guid) uint32 Player::GetRankFromDB(ObjectGuid guid) { - QueryResult* result = CharacterDatabase.PQuery("SELECT rank FROM guild_member WHERE guid='%u'", guid.GetCounter()); + QueryResult* result = CharacterDatabase.PQuery("SELECT `rank` FROM `guild_member` WHERE `guid`='%u'", guid.GetCounter()); if (result) { uint32 v = result->Fetch()[0].GetUInt32(); @@ -6648,7 +6648,7 @@ uint32 Player::GetZoneIdFromDB(ObjectGuid guid) } else { - QueryResult* result = CharacterDatabase.PQuery("SELECT zone FROM characters WHERE guid='%u'", lowguid); + QueryResult* result = CharacterDatabase.PQuery("SELECT `zone` FROM `characters` WHERE `guid`='%u'", lowguid); if (!result) return 0; Field* fields = result->Fetch(); @@ -6658,7 +6658,7 @@ uint32 Player::GetZoneIdFromDB(ObjectGuid guid) if (!zone) { // stored zone is zero, use generic and slow zone detection - result = CharacterDatabase.PQuery("SELECT map,position_x,position_y,position_z FROM characters WHERE guid='%u'", lowguid); + result = CharacterDatabase.PQuery("SELECT `map`, `position_x`, `position_y`, `position_z` FROM `characters` WHERE `guid`='%u'", lowguid); if (!result) return 0; fields = result->Fetch(); @@ -6671,7 +6671,7 @@ uint32 Player::GetZoneIdFromDB(ObjectGuid guid) zone = sTerrainMgr.GetZoneId(map, posx, posy, posz); if (zone > 0) - CharacterDatabase.PExecute("UPDATE characters SET zone='%u' WHERE guid='%u'", zone, lowguid); + CharacterDatabase.PExecute("UPDATE `characters` SET `zone`='%u' WHERE `guid`='%u'", zone, lowguid); } } return zone; @@ -6687,7 +6687,7 @@ uint32 Player::GetLevelFromDB(ObjectGuid guid) } else { - QueryResult* result = CharacterDatabase.PQuery("SELECT level FROM characters WHERE guid='%u'", lowguid); + QueryResult* result = CharacterDatabase.PQuery("SELECT `level` FROM `characters` WHERE `guid`='%u'", lowguid); if (!result) return 0; @@ -10799,7 +10799,7 @@ void Player::DestroyItem(uint8 bag, uint8 slot, bool update) { static SqlStatementID delGifts ; - SqlStatement stmt = CharacterDatabase.CreateStatement(delGifts, "DELETE FROM character_gifts WHERE item_guid = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delGifts, "DELETE FROM `character_gifts` WHERE `item_guid` = ?"); stmt.PExecute(pItem->GetGUIDLow()); } @@ -14613,7 +14613,7 @@ bool Player::LoadPositionFromDB(ObjectGuid guid, uint32& mapid, float& x, float& } else { - QueryResult* result = CharacterDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map,taxi_path FROM characters WHERE guid = '%u'", guid.GetCounter()); + QueryResult* result = CharacterDatabase.PQuery("SELECT `position_x`, `position_y`, `position_z`, `orientation`, `map`, `taxi_path` FROM `characters` WHERE `guid` = '%u'", guid.GetCounter()); if (!result) return false; @@ -14691,7 +14691,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder) if (ObjectMgr::CheckPlayerName(m_name) != CHAR_NAME_SUCCESS || (GetSession()->GetSecurity() == SEC_PLAYER && sObjectMgr.IsReservedName(m_name))) { - CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid ='%u'", + CharacterDatabase.PExecute("UPDATE `characters` SET `at_login` = `at_login` | '%u' WHERE `guid` ='%u'", uint32(AT_LOGIN_RENAME), guid.GetCounter()); return false; } @@ -15492,9 +15492,9 @@ void Player::_LoadInventory(QueryResult* result, uint32 timediff, bool& has_epic if (!proto) { - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid); - CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item_lowguid); - CharacterDatabase.PExecute("INSERT INTO character_deleted_items (player_guid, item_entry, stack_count) VALUES ('%u', '%u', '%u')", GetGUIDLow(), item_id, fields[2].GetUInt32()); + CharacterDatabase.PExecute("DELETE FROM `character_inventory` WHERE `item` = '%u'", item_lowguid); + CharacterDatabase.PExecute("DELETE FROM `item_instance` WHERE `guid` = '%u'", item_lowguid); + CharacterDatabase.PExecute("INSERT INTO `character_deleted_items` (`player_guid`, `item_entry`, `stack_count`) VALUES ('%u', '%u', '%u')", GetGUIDLow(), item_id, fields[2].GetUInt32()); sLog.outError("Player::_LoadInventory: Player %s has an unknown item (id: #%u) in inventory, deleted.", GetName(), item_id); continue; } @@ -15509,7 +15509,7 @@ void Player::_LoadInventory(QueryResult* result, uint32 timediff, bool& has_epic { std::stringstream oss; oss << "Duplicate item (via AH) " << item_id << " GUID:" << item_lowguid << ", count: " << item->GetCount() << ", bag: " << bag_guid << ", slot: " << uint32(slot); - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_inventory` WHERE `item` = '%u'", item_lowguid); GetSession()->ProcessAnticheatAction("PassiveAnticheat", oss.str().c_str(), CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS); DETAIL_LOG(oss.str().c_str()); continue; @@ -15526,7 +15526,7 @@ void Player::_LoadInventory(QueryResult* result, uint32 timediff, bool& has_epic if (!item->LoadFromDB(item_lowguid, GetObjectGuid(), fields, item_id)) { sLog.outError("Player::_LoadInventory: Player %s has broken item (id: #%u) in inventory, deleted.", GetName(), item_id); - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_inventory` WHERE `item` = '%u'", item_lowguid); item->FSetState(ITEM_REMOVED); item->SaveToDB(); // it also deletes item object ! continue; @@ -15544,7 +15544,7 @@ void Player::_LoadInventory(QueryResult* result, uint32 timediff, bool& has_epic // not allow have in alive state item limited to another map/zone if (IsAlive() && item->IsLimitedToAnotherMapOrZone(GetMapId(), zone)) { - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_inventory` WHERE `item` = '%u'", item_lowguid); item->FSetState(ITEM_REMOVED); item->SaveToDB(); // it also deletes item object ! continue; @@ -15553,7 +15553,7 @@ void Player::_LoadInventory(QueryResult* result, uint32 timediff, bool& has_epic // "Conjured items disappear if you are logged out for more than 15 minutes" if (timediff > 15 * MINUTE && (item->GetProto()->Flags & ITEM_FLAG_CONJURED)) { - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_inventory` WHERE `item` = '%u'", item_lowguid); item->FSetState(ITEM_REMOVED); item->SaveToDB(); // it also deletes item object ! continue; @@ -15646,7 +15646,7 @@ void Player::_LoadInventory(QueryResult* result, uint32 timediff, bool& has_epic // Un probleme avec la maniere // dont le PNJ de Bienvenue ajoute le stuff ... //sLog.outError("Player::_LoadInventory: Player %s has item (GUID: %u Entry: %u) can't be loaded to inventory (Bag GUID: %u Slot: %u) by some reason, will send by mail.", GetName(),item_lowguid, item_id, bag_guid, slot); - CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_inventory` WHERE `item` = '%u'", item_lowguid); problematicItems.push_back(item); std::stringstream oss; oss << "Broken item " << item->GetEntry() << " GUID:" << item->GetGUIDLow() << " count:" << item->GetCount() << " bag:" << bag_guid << " slot:" << uint32(slot); @@ -15695,7 +15695,7 @@ void Player::_LoadItemLoot(QueryResult* result) if (!item) { - CharacterDatabase.PExecute("DELETE FROM item_loot WHERE guid = '%u'", item_guid); + CharacterDatabase.PExecute("DELETE FROM `item_loot` WHERE `guid` = '%u'", item_guid); sLog.outError("Player::_LoadItemLoot: Player %s has loot for nonexistent item (GUID: %u) in `item_loot`, deleted.", GetName(), item_guid); continue; } @@ -15879,7 +15879,7 @@ void Player::_LoadBoundInstances(QueryResult* result) if (!mapEntry || !mapEntry->IsDungeon()) { sLog.outError("_LoadBoundInstances: player %s(%d) has bind to nonexistent or not dungeon map %d", GetName(), GetGUIDLow(), mapId); - CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'", GetGUIDLow(), instanceId); + CharacterDatabase.PExecute("DELETE FROM `character_instance` WHERE `guid` = '%u' AND `instance` = '%u'", GetGUIDLow(), instanceId); continue; } @@ -15887,7 +15887,7 @@ void Player::_LoadBoundInstances(QueryResult* result) { sLog.outError("_LoadBoundInstances: %s is in group (Id: %d) but has a non-permanent character bind to map %d,%d", GetGuidStr().c_str(), group->GetId(), mapId, instanceId); - CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'", + CharacterDatabase.PExecute("DELETE FROM `character_instance` WHERE `guid` = '%u' AND `instance` = '%u'", GetGUIDLow(), instanceId); continue; } @@ -15920,7 +15920,7 @@ void Player::UnbindInstance(BoundInstancesMap::iterator &itr, bool unload) if (itr != m_boundInstances.end()) { if (!unload) - CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND instance = '%u'", + CharacterDatabase.PExecute("DELETE FROM `character_instance` WHERE `guid` = '%u' AND `instance` = '%u'", GetGUIDLow(), itr->second.state->GetInstanceId()); itr->second.state->RemovePlayer(this); // state can become invalid m_boundInstances.erase(itr++); @@ -15939,13 +15939,13 @@ InstancePlayerBind* Player::BindToInstance(DungeonPersistentState* state, bool p // update the state when the group kills a boss if (permanent != bind.perm || state != bind.state) if (!load) - CharacterDatabase.PExecute("UPDATE character_instance SET instance = '%u', permanent = '%u' WHERE guid = '%u' AND instance = '%u'", + CharacterDatabase.PExecute("UPDATE `character_instance` SET `instance` = '%u', `permanent` = '%u' WHERE `guid` = '%u' AND `instance` = '%u'", state->GetInstanceId(), permanent, GetGUIDLow(), bind.state->GetInstanceId()); } else { if (!load) - CharacterDatabase.PExecute("INSERT INTO character_instance (guid, instance, permanent) VALUES ('%u', '%u', '%u')", + CharacterDatabase.PExecute("INSERT INTO `character_instance` (`guid`, `instance`, `permanent`) VALUES ('%u', '%u', '%u')", GetGUIDLow(), state->GetInstanceId(), permanent); } @@ -16102,11 +16102,11 @@ void Player::ConvertInstancesToGroup(Player* player, Group* group, ObjectGuid pl // if the player's not online we don't know what binds it has if (!player || !group || has_binds) - CharacterDatabase.PExecute("INSERT INTO group_instance SELECT guid, instance, permanent FROM character_instance WHERE guid = '%u'", player_lowguid); + CharacterDatabase.PExecute("INSERT INTO `group_instance` SELECT `guid`, `instance`, `permanent` FROM `character_instance` WHERE `guid` = '%u'", player_lowguid); // the following should not get executed when changing leaders if (!player || has_solo) - CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%u' AND permanent = 0", player_lowguid); + CharacterDatabase.PExecute("DELETE FROM `character_instance` WHERE `guid` = '%u' AND `permanent` = 0", player_lowguid); } bool Player::_LoadHomeBind(QueryResult* result) @@ -16136,7 +16136,7 @@ bool Player::_LoadHomeBind(QueryResult* result) !bindMapEntry->Instanceable()) ok = true; else - CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = '%u'", GetGUIDLow()); + CharacterDatabase.PExecute("DELETE FROM `character_homebind` WHERE `guid` = '%u'", GetGUIDLow()); } if (!ok) @@ -16147,7 +16147,7 @@ bool Player::_LoadHomeBind(QueryResult* result) m_homebindY = info->positionY; m_homebindZ = info->positionZ; - CharacterDatabase.PExecute("INSERT INTO character_homebind (guid,map,zone,position_x,position_y,position_z) VALUES ('%u', '%u', '%u', '%f', '%f', '%f')", GetGUIDLow(), m_homebindMapId, (uint32)m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ); + CharacterDatabase.PExecute("INSERT INTO `character_homebind` (`guid`, `map`, `zone`, `position_x`, `position_y`, `position_z`) VALUES ('%u', '%u', '%u', '%f', '%f', '%f')", GetGUIDLow(), m_homebindMapId, (uint32)m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ); } DEBUG_LOG("Setting player home position: mapid is: %u, zoneid is %u, X is %f, Y is %f, Z is %f", @@ -16217,16 +16217,16 @@ void Player::SaveToDB(bool online, bool force) static SqlStatementID insChar; - SqlStatement uberInsert = CharacterDatabase.CreateStatement(insChar, "REPLACE INTO characters (guid,account,name,race,class,gender,level,xp,money,playerBytes,playerBytes2,playerFlags," - "map, position_x, position_y, position_z, orientation, " - "taximask, online, cinematic, " - "totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_multiplier, resettalents_time, " - "trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, " - "death_expire_time, taxi_path, " - "honorRankPoints, honorHighestRank, honorStanding, honorLastWeekHK, honorLastWeekCP, honorStoredHK, honorStoredDK, " - "watchedFaction, drunk, health, power1, power2, power3, " - "power4, power5, exploredZones, equipmentCache, ammoId, actionBars, " - "area, world_phase_mask) " + SqlStatement uberInsert = CharacterDatabase.CreateStatement(insChar, "REPLACE INTO `characters` (`guid`, `account`, `name`, `race`, `class`, `gender`, `level`, `xp`, `money`, `playerBytes`, `playerBytes2`, `playerFlags`," + "`map`, `position_x`, `position_y`, `position_z`, `orientation`, " + "`taximask`, `online`, `cinematic`, " + "`totaltime`, `leveltime`, `rest_bonus`, `logout_time`, `is_logout_resting`, `resettalents_multiplier`, `resettalents_time`, " + "`trans_x`, `trans_y`, `trans_z`, `trans_o`, `transguid`, `extra_flags`, `stable_slots`, `at_login`, `zone`, " + "`death_expire_time`, `taxi_path`, " + "`honorRankPoints`, `honorHighestRank`, `honorStanding`, `honorLastWeekHK`, `honorLastWeekCP`, `honorStoredHK`, `honorStoredDK`, " + "`watchedFaction`, `drunk`, `health`, `power1`, `power2`, `power3`, " + "`power4`, `power5`, `exploredZones`, `equipmentCache`, `ammoId`, `actionBars`, " + "`area`, `world_phase_mask`) " "VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?," "?, ?, ?, ?, ?, " "?, ?, ?, " @@ -16418,7 +16418,7 @@ void Player::SaveGoldToDB() { static SqlStatementID updateGold ; - SqlStatement stmt = CharacterDatabase.CreateStatement(updateGold, "UPDATE characters SET money = ? WHERE guid = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(updateGold, "UPDATE `characters` SET `money` = ? WHERE `guid` = ?"); stmt.PExecute(GetMoney(), GetGUIDLow()); } @@ -16427,7 +16427,7 @@ void Player::_SaveAuras() static SqlStatementID deleteAuras ; static SqlStatementID insertAuras ; - SqlStatement stmt = CharacterDatabase.CreateStatement(deleteAuras, "DELETE FROM character_aura WHERE guid = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(deleteAuras, "DELETE FROM `character_aura` WHERE `guid` = ?"); stmt.PExecute(GetGUIDLow()); SpellAuraHolderMap const& auraHolders = GetSpellAuraHolderMap(); @@ -16435,8 +16435,8 @@ void Player::_SaveAuras() if (auraHolders.empty()) return; - stmt = CharacterDatabase.CreateStatement(insertAuras, "INSERT INTO character_aura (guid, caster_guid, item_guid, spell, stackcount, remaincharges, " - "basepoints0, basepoints1, basepoints2, periodictime0, periodictime1, periodictime2, maxduration, remaintime, effIndexMask) " + stmt = CharacterDatabase.CreateStatement(insertAuras, "INSERT INTO `character_aura` (`guid`, `caster_guid`, `item_guid`, `spell`, `stackcount`, `remaincharges`, " + "`basepoints0`, `basepoints1`, `basepoints2`, `periodictime0`, `periodictime1`, `periodictime2`, `maxduration`, `remaintime`, `effIndexMask`) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); AuraSaveStruct s; @@ -16525,10 +16525,10 @@ void Player::_SaveInventory() static SqlStatementID delInv ; static SqlStatementID delItemInst ; - SqlStatement stmt = CharacterDatabase.CreateStatement(delInv, "DELETE FROM character_inventory WHERE item = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delInv, "DELETE FROM `character_inventory` WHERE `item` = ?"); stmt.PExecute(item->GetGUIDLow()); - stmt = CharacterDatabase.CreateStatement(delItemInst, "DELETE FROM item_instance WHERE guid = ?"); + stmt = CharacterDatabase.CreateStatement(delItemInst, "DELETE FROM `item_instance` WHERE `guid` = ?"); stmt.PExecute(item->GetGUIDLow()); m_items[i]->FSetState(ITEM_NEW); @@ -16558,7 +16558,7 @@ void Player::_SaveInventory() bagTestGUID = test2->GetGUIDLow(); // according to the test that was just performed nothing should be in this slot, delete static SqlStatementID deleteInventoryAntiDupli; - SqlStatement stmt = CharacterDatabase.CreateStatement(deleteInventoryAntiDupli, "DELETE FROM character_inventory WHERE bag=? AND slot=? AND guid=?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(deleteInventoryAntiDupli, "DELETE FROM `character_inventory` WHERE `bag`=? AND `slot`=? AND `guid`=?"); stmt.addUInt32(bagTestGUID); stmt.addUInt32(item->GetSlot()); stmt.addUInt32(GetGUIDLow()); @@ -16590,7 +16590,7 @@ void Player::_SaveInventory() { case ITEM_NEW: { - SqlStatement stmt = CharacterDatabase.CreateStatement(insertInventory, "INSERT INTO character_inventory (guid,bag,slot,item,item_template) VALUES (?, ?, ?, ?, ?)"); + SqlStatement stmt = CharacterDatabase.CreateStatement(insertInventory, "INSERT INTO `character_inventory` (`guid`, `bag`, `slot`, `item`, `item_template`) VALUES (?, ?, ?, ?, ?)"); stmt.addUInt32(GetGUIDLow()); stmt.addUInt32(bag_guid); stmt.addUInt8(item->GetSlot()); @@ -16601,7 +16601,7 @@ void Player::_SaveInventory() break; case ITEM_CHANGED: { - SqlStatement stmt = CharacterDatabase.CreateStatement(updateInventory, "UPDATE character_inventory SET guid = ?, bag = ?, slot = ?, item_template = ? WHERE item = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(updateInventory, "UPDATE `character_inventory` SET `guid` = ?, `bag` = ?, `slot` = ?, `item_template` = ? WHERE `item` = ?"); stmt.addUInt32(GetGUIDLow()); stmt.addUInt32(bag_guid); stmt.addUInt8(item->GetSlot()); @@ -16612,7 +16612,7 @@ void Player::_SaveInventory() break; case ITEM_REMOVED: { - SqlStatement stmt = CharacterDatabase.CreateStatement(deleteInventory, "DELETE FROM character_inventory WHERE item = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(deleteInventory, "DELETE FROM `character_inventory` WHERE `item` = ?"); stmt.PExecute(item->GetGUIDLow()); } break; @@ -16638,7 +16638,7 @@ void Player::_SaveQuestStatus() if (i->second.uState == QUEST_DELETED) { static SqlStatementID deleteQuestStatus ; - SqlStatement stmt = CharacterDatabase.CreateStatement(deleteQuestStatus, "DELETE FROM character_queststatus WHERE guid = ? AND quest = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(deleteQuestStatus, "DELETE FROM `character_queststatus` WHERE `guid` = ? AND `quest` = ?"); stmt.PExecute(GetGUIDLow(), i->first); mQuestStatus.erase(i); i = mQuestStatus.begin(); @@ -16648,7 +16648,7 @@ void Player::_SaveQuestStatus() { case QUEST_NEW : { - SqlStatement stmt = CharacterDatabase.CreateStatement(insertQuestStatus, "INSERT INTO character_queststatus (guid,quest,status,rewarded,explored,timer,mobcount1,mobcount2,mobcount3,mobcount4,itemcount1,itemcount2,itemcount3,itemcount4,reward_choice) " + SqlStatement stmt = CharacterDatabase.CreateStatement(insertQuestStatus, "INSERT INTO `character_queststatus` (`guid`, `quest`, `status`, `rewarded`, `explored`, `timer`, `mobcount1`, `mobcount2`, `mobcount3`, `mobcount4`, `itemcount1`, `itemcount2`, `itemcount3`, `itemcount4`, `reward_choice`) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); stmt.addUInt32(GetGUIDLow()); @@ -16667,8 +16667,8 @@ void Player::_SaveQuestStatus() break; case QUEST_CHANGED : { - SqlStatement stmt = CharacterDatabase.CreateStatement(updateQuestStatus, "UPDATE character_queststatus SET status = ?,rewarded = ?,reward_choice = ?,explored = ?,timer = ?," - "mobcount1 = ?,mobcount2 = ?,mobcount3 = ?,mobcount4 = ?,itemcount1 = ?,itemcount2 = ?,itemcount3 = ?,itemcount4 = ? WHERE guid = ? AND quest = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(updateQuestStatus, "UPDATE `character_queststatus` SET `status` = ?, `rewarded` = ?, `reward_choice` = ?, `explored` = ?, `timer` = ?," + "`mobcount1` = ?, `mobcount2` = ?, `mobcount3` = ?, `mobcount4` = ?, `itemcount1` = ?, `itemcount2` = ?, `itemcount3` = ?, `itemcount4` = ? WHERE `guid` = ? AND `quest` = ?"); stmt.addUInt8(i->second.m_status); stmt.addUInt8(i->second.m_rewarded); @@ -16709,7 +16709,7 @@ void Player::_SaveSkills() if (itr->second.uState == SKILL_DELETED) { - SqlStatement stmt = CharacterDatabase.CreateStatement(delSkills, "DELETE FROM character_skills WHERE guid = ? AND skill = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delSkills, "DELETE FROM `character_skills` WHERE `guid` = ? AND `skill` = ?"); stmt.PExecute(GetGUIDLow(), itr->first); mSkillStatus.erase(itr++); continue; @@ -16723,13 +16723,13 @@ void Player::_SaveSkills() { case SKILL_NEW: { - SqlStatement stmt = CharacterDatabase.CreateStatement(insSkills, "INSERT INTO character_skills (guid, skill, value, max) VALUES (?, ?, ?, ?)"); + SqlStatement stmt = CharacterDatabase.CreateStatement(insSkills, "INSERT INTO `character_skills` (`guid`, `skill`, `value`, `max`) VALUES (?, ?, ?, ?)"); stmt.PExecute(GetGUIDLow(), itr->first, value, max); } break; case SKILL_CHANGED: { - SqlStatement stmt = CharacterDatabase.CreateStatement(updSkills, "UPDATE character_skills SET value = ?, max = ? WHERE guid = ? AND skill = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(updSkills, "UPDATE `character_skills` SET `value` = ?, `max` = ? WHERE `guid` = ? AND `skill` = ?"); stmt.PExecute(value, max, GetGUIDLow(), itr->first); } break; @@ -16752,7 +16752,7 @@ void Player::_SaveSkills() { if (itr.second > 1) { - SqlStatement stmt = CharacterDatabase.CreateStatement(forSkills, "REPLACE INTO character_forgotten_skills (guid, skill, value) VALUES (?, ?, ?)"); + SqlStatement stmt = CharacterDatabase.CreateStatement(forSkills, "REPLACE INTO `character_forgotten_skills` (`guid`, `skill`, `value`) VALUES (?, ?, ?)"); stmt.PExecute(GetGUIDLow(), itr.first, itr.second); } } @@ -16764,8 +16764,8 @@ void Player::_SaveSpells() static SqlStatementID delSpells ; static SqlStatementID insSpells ; - SqlStatement stmtDel = CharacterDatabase.CreateStatement(delSpells, "DELETE FROM character_spell WHERE guid = ? and spell = ?"); - SqlStatement stmtIns = CharacterDatabase.CreateStatement(insSpells, "INSERT INTO character_spell (guid,spell,active,disabled) VALUES (?, ?, ?, ?)"); + SqlStatement stmtDel = CharacterDatabase.CreateStatement(delSpells, "DELETE FROM `character_spell` WHERE `guid` = ? and `spell` = ?"); + SqlStatement stmtIns = CharacterDatabase.CreateStatement(insSpells, "INSERT INTO `character_spell` (`guid`, `spell`, `active`, `disabled`) VALUES (?, ?, ?, ?)"); for (PlayerSpellMap::iterator itr = m_spells.begin(); itr != m_spells.end();) { @@ -16798,12 +16798,12 @@ void Player::_SaveStats() static SqlStatementID delStats ; static SqlStatementID insertStats ; - SqlStatement stmt = CharacterDatabase.CreateStatement(delStats, "DELETE FROM character_stats WHERE guid = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delStats, "DELETE FROM `character_stats` WHERE `guid` = ?"); stmt.PExecute(GetGUIDLow()); - stmt = CharacterDatabase.CreateStatement(insertStats, "INSERT INTO character_stats (guid, maxhealth, maxpower1, maxpower2, maxpower3, maxpower4, maxpower5, " - "strength, agility, stamina, intellect, spirit, armor, resHoly, resFire, resNature, resFrost, resShadow, resArcane, " - "blockPct, dodgePct, parryPct, critPct, rangedCritPct, attackPower, rangedAttackPower) " + stmt = CharacterDatabase.CreateStatement(insertStats, "INSERT INTO `character_stats` (`guid`, `maxhealth`, `maxpower1`, `maxpower2`, `maxpower3`, `maxpower4`, `maxpower5`, " + "`strength`, `agility`, `stamina`, `intellect`, `spirit`, `armor`, `resHoly`, `resFire`, `resNature`, `resFrost`, `resShadow`, `resArcane`, " + "`blockPct`, `dodgePct`, `parryPct`, `critPct`, `rangedCritPct`, `attackPower`, `rangedAttackPower`) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); stmt.addUInt32(GetGUIDLow()); @@ -16862,10 +16862,10 @@ bool Player::CanSpeak() const void Player::SavePositionInDB(ObjectGuid guid, uint32 mapid, float x, float y, float z, float o, uint32 zone) { std::ostringstream ss; - ss << "UPDATE characters SET position_x='" << x << "',position_y='" << y - << "',position_z='" << z << "',orientation='" << o << "',map='" << mapid - << "',zone='" << zone << "',trans_x='0',trans_y='0',trans_z='0'," - << "transguid='0',taxi_path='' WHERE guid='" << guid.GetCounter() << "'"; + ss << "UPDATE `characters` SET `position_x`='" << x << "',`position_y`='" << y + << "',`position_z`='" << z << "',`orientation`='" << o << "',`map`='" << mapid + << "',`zone`='" << zone << "',`trans_x`='0',`trans_y`='0',`trans_z`='0'," + << "`transguid`='0',`taxi_path`='' WHERE `guid`='" << guid.GetCounter() << "'"; DEBUG_LOG("%s", ss.str().c_str()); CharacterDatabase.Execute(ss.str().c_str()); } @@ -17549,8 +17549,8 @@ void Player::RemovePetitionsAndSigns(ObjectGuid guid) */ CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("DELETE FROM petition WHERE ownerguid = '%u'", lowguid); - CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE ownerguid = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `petition` WHERE `ownerguid` = '%u'", lowguid); + CharacterDatabase.PExecute("DELETE FROM `petition_sign` WHERE `ownerguid` = '%u'", lowguid); CharacterDatabase.CommitTransaction(); } @@ -20141,7 +20141,7 @@ void Player::_LoadSkills(QueryResult* result) if (value == 0) { sLog.outError("Character %u has skill %u with value 0. Will be deleted.", GetGUIDLow(), skill); - CharacterDatabase.PExecute("DELETE FROM character_skills WHERE guid = '%u' AND skill = '%u' ", GetGUIDLow(), skill); + CharacterDatabase.PExecute("DELETE FROM `character_skills` WHERE `guid` = '%u' AND `skill` = '%u' ", GetGUIDLow(), skill); continue; } @@ -20478,13 +20478,13 @@ void Player::_SaveBGData() static SqlStatementID delBGData ; static SqlStatementID insBGData ; - SqlStatement stmt = CharacterDatabase.CreateStatement(delBGData, "DELETE FROM character_battleground_data WHERE guid = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delBGData, "DELETE FROM `character_battleground_data` WHERE `guid` = ?"); stmt.PExecute(GetGUIDLow()); if (m_bgData.bgInstanceID || InBattleGroundQueue()) { - stmt = CharacterDatabase.CreateStatement(insBGData, "INSERT INTO character_battleground_data VALUES (?, ?, ?, ?, ?, ?, ?, ?)"); + stmt = CharacterDatabase.CreateStatement(insBGData, "INSERT INTO `character_battleground_data` VALUES (?, ?, ?, ?, ?, ?, ?, ?)"); /* guid, bgInstanceID, bgTeam, x, y, z, o, map */ stmt.addUInt32(GetGUIDLow()); stmt.addUInt32(m_bgData.bgInstanceID); @@ -20506,7 +20506,7 @@ void Player::RemoveAtLoginFlag(AtLoginFlags f, bool in_db_also /*= false*/) m_atLoginFlags &= ~f; if (in_db_also) - CharacterDatabase.PExecute("UPDATE characters set at_login = at_login & ~ %u WHERE guid ='%u'", uint32(f), GetGUIDLow()); + CharacterDatabase.PExecute("UPDATE `characters` SET `at_login` = `at_login` & ~ %u WHERE `guid` ='%u'", uint32(f), GetGUIDLow()); } void Player::SendClearCooldown(uint32 spell_id, Unit* target) const @@ -20554,7 +20554,7 @@ void Player::SetHomebindToLocation(WorldLocation const& loc, uint32 area_id) m_homebindZ = loc.z; // update sql homebind - CharacterDatabase.PExecute("UPDATE character_homebind SET map = '%u', zone = '%u', position_x = '%f', position_y = '%f', position_z = '%f' WHERE guid = '%u'", + CharacterDatabase.PExecute("UPDATE `character_homebind` SET `map` = '%u', `zone` = '%u', `position_x` = '%f', `position_y` = '%f', `position_z` = '%f' WHERE `guid` = '%u'", m_homebindMapId, m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ, GetGUIDLow()); } diff --git a/src/game/Protocol/WorldSocket.cpp b/src/game/Protocol/WorldSocket.cpp index 910823b32..f1d764e04 100644 --- a/src/game/Protocol/WorldSocket.cpp +++ b/src/game/Protocol/WorldSocket.cpp @@ -163,9 +163,9 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket) LoginDatabase.escape_string(safe_account); // No SQL injection, username escaped. - QueryResult* result = LoginDatabase.PQuery("SELECT a.id, aa.gmLevel, a.sessionkey, a.last_ip, a.locked, a.v, a.s, a.mutetime, a.locale, a.os, a.flags, " - "ab.unbandate > UNIX_TIMESTAMP() OR ab.unbandate = ab.bandate FROM account a LEFT JOIN account_access aa ON a.id = aa.id AND aa.RealmID IN (-1, %u) " - "LEFT JOIN account_banned ab ON a.id = ab.id AND ab.active = 1 WHERE a.username = '%s' ORDER BY aa.RealmID DESC LIMIT 1", realmID, safe_account.c_str()); + QueryResult* result = LoginDatabase.PQuery("SELECT a.`id`, aa.`gmLevel`, a.`sessionkey`, a.`last_ip`, a.`locked`, a.`v`, a.`s`, a.`mutetime`, a.`locale`, a.`os`, a.`flags`, " + "ab.`unbandate` > UNIX_TIMESTAMP() OR ab.`unbandate` = ab.`bandate` FROM `account` a LEFT JOIN `account_access` aa ON a.`id` = aa.`id` AND aa.`RealmID` IN (-1, %u) " + "LEFT JOIN `account_banned` ab ON a.`id` = ab.`id` AND ab.`active` = 1 WHERE a.`username` = '%s' ORDER BY aa.`RealmID` DESC LIMIT 1", realmID, safe_account.c_str()); // Stop if the account is not found if (!result) @@ -294,7 +294,7 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket) // No SQL injection, username escaped. static SqlStatementID updAccount; - SqlStatement stmt = LoginDatabase.CreateStatement(updAccount, "UPDATE account SET last_ip = ? WHERE username = ?"); + SqlStatement stmt = LoginDatabase.CreateStatement(updAccount, "UPDATE `account` SET `last_ip` = ? WHERE `username` = ?"); stmt.PExecute(address.c_str(), account.c_str()); ClientOSType clientOs; diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp index 347d9ca8e..f92bd7b53 100644 --- a/src/game/ScriptMgr.cpp +++ b/src/game/ScriptMgr.cpp @@ -80,8 +80,8 @@ void ScriptMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename) scripts.clear(); // need for reload support - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - QueryResult* result = WorldDatabase.PQuery("SELECT id, delay, command, datalong, datalong2, datalong3, datalong4, target_param1, target_param2, target_type, data_flags, dataint, dataint2, dataint3, dataint4, x, y, z, o, condition_id FROM %s", tablename); + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + QueryResult* result = WorldDatabase.PQuery("SELECT `id`, `delay`, `command`, `datalong`, `datalong2`, `datalong3`, `datalong4`, `target_param1`, `target_param2`, `target_type`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `x`, `y`, `z`, `o`, `condition_id` FROM %s", tablename); uint32 count = 0; @@ -1429,7 +1429,7 @@ void ScriptMgr::LoadCreatureEventAIScripts() // Check for scripts with delay, which is not supported for this table. for (uint8 i = 1; i <= 3; i++) { - result = WorldDatabase.Query("SELECT DISTINCT id FROM creature_ai_scripts WHERE delay != 0"); + result = WorldDatabase.Query("SELECT DISTINCT `id` FROM `creature_ai_scripts` WHERE `delay` != 0"); if (result) { @@ -1447,7 +1447,7 @@ void ScriptMgr::LoadCreatureEventAIScripts() std::set actionIds; for (uint8 i = 1; i <= 3; i++) { - result = WorldDatabase.PQuery("SELECT action%u_script FROM creature_ai_events", i); + result = WorldDatabase.PQuery("SELECT `action%u_script` FROM `creature_ai_events`", i); if (result) { @@ -1506,7 +1506,7 @@ void ScriptMgr::CheckScriptTexts(ScriptMapMap const& scripts) void ScriptMgr::LoadAreaTriggerScripts() { m_AreaTriggerScripts.clear(); // need for reload case - QueryResult* result = WorldDatabase.Query("SELECT entry, script_name FROM scripted_areatrigger"); + QueryResult* result = WorldDatabase.Query("SELECT `entry`, `script_name` FROM `scripted_areatrigger`"); uint32 count = 0; @@ -1552,7 +1552,7 @@ void ScriptMgr::LoadAreaTriggerScripts() void ScriptMgr::LoadEventIdScripts() { m_EventIdScripts.clear(); // need for reload case - QueryResult* result = WorldDatabase.Query("SELECT id, script_name FROM scripted_event_id"); + QueryResult* result = WorldDatabase.Query("SELECT `id`, `script_name` FROM `scripted_event_id`"); uint32 count = 0; @@ -1601,15 +1601,15 @@ void ScriptMgr::LoadScriptNames() { m_scriptNames.push_back(""); QueryResult* result = WorldDatabase.Query( - "SELECT DISTINCT(script_name) FROM creature_template WHERE script_name <> '' " + "SELECT DISTINCT(`script_name`) FROM `creature_template` WHERE `script_name` <> '' " "UNION " - "SELECT DISTINCT(script_name) FROM gameobject_template WHERE script_name <> '' " + "SELECT DISTINCT(`script_name`) FROM `gameobject_template` WHERE `script_name` <> '' " "UNION " - "SELECT DISTINCT(script_name) FROM scripted_areatrigger WHERE script_name <> '' " + "SELECT DISTINCT(`script_name`) FROM `scripted_areatrigger` WHERE `script_name` <> '' " "UNION " - "SELECT DISTINCT(script_name) FROM scripted_event_id WHERE script_name <> '' " + "SELECT DISTINCT(`script_name`) FROM `scripted_event_id` WHERE `script_name` <> '' " "UNION " - "SELECT DISTINCT(script_name) FROM map_template WHERE script_name <> ''"); + "SELECT DISTINCT(`script_name`) FROM `map_template` WHERE `script_name` <> ''"); if (!result) { @@ -1985,7 +1985,7 @@ void ScriptMgr::LoadScriptTexts() sLog.outString("Loading Script Texts..."); sObjectMgr.LoadMangosStrings(WorldDatabase, "script_texts", TEXT_SOURCE_TEXT_START, TEXT_SOURCE_TEXT_END, true); - QueryResult* result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM script_texts WHERE entry BETWEEN %i AND %i", TEXT_SOURCE_TEXT_END, TEXT_SOURCE_TEXT_START); + QueryResult* result = WorldDatabase.PQuery("SELECT `entry`, `sound`, `type`, `language`, `emote` FROM `script_texts` WHERE `entry` BETWEEN %i AND %i", TEXT_SOURCE_TEXT_END, TEXT_SOURCE_TEXT_START); sLog.outString("Loading Script Texts additional data..."); @@ -2047,7 +2047,7 @@ void ScriptMgr::LoadScriptTextsCustom() sLog.outString("Loading Custom Texts..."); sObjectMgr.LoadMangosStrings(WorldDatabase, "custom_texts", TEXT_SOURCE_CUSTOM_START, TEXT_SOURCE_CUSTOM_END, true); - QueryResult* result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM custom_texts WHERE entry BETWEEN %i AND %i", TEXT_SOURCE_CUSTOM_END, TEXT_SOURCE_CUSTOM_START); + QueryResult* result = WorldDatabase.PQuery("SELECT `entry`, `sound`, `type`, `language`, `emote` FROM `custom_texts` WHERE `entry` BETWEEN %i AND %i", TEXT_SOURCE_CUSTOM_END, TEXT_SOURCE_CUSTOM_START); sLog.outString("Loading Custom Texts additional data..."); @@ -2112,7 +2112,7 @@ void ScriptMgr::LoadScriptWaypoints() uint64 uiCreatureCount = 0; // Load Waypoints - QueryResult* result = WorldDatabase.PQuery("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry"); + QueryResult* result = WorldDatabase.PQuery("SELECT COUNT(`entry`) FROM `script_waypoint` GROUP BY `entry`"); if (result) { uiCreatureCount = result->GetRowCount(); @@ -2121,7 +2121,7 @@ void ScriptMgr::LoadScriptWaypoints() sLog.outString("Loading Script Waypoints for %u creature(s)...", uiCreatureCount); - result = WorldDatabase.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid"); + result = WorldDatabase.PQuery("SELECT `entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime` FROM `script_waypoint` ORDER BY `pointid`"); if (result) { @@ -2179,7 +2179,7 @@ void ScriptMgr::LoadEscortData() uint64 EscortDataCount = 0; - QueryResult* pResult = WorldDatabase.PQuery("SELECT creature_id, quest, escort_faction FROM script_escort_data"); + QueryResult* pResult = WorldDatabase.PQuery("SELECT `creature_id`, `quest`, `escort_faction` FROM `script_escort_data`"); if (pResult) { diff --git a/src/game/Spells/SpellMgr.cpp b/src/game/Spells/SpellMgr.cpp index 5282bf792..c870385f3 100644 --- a/src/game/Spells/SpellMgr.cpp +++ b/src/game/Spells/SpellMgr.cpp @@ -49,8 +49,8 @@ void SpellMgr::LoadSpellTargetPositions() uint32 count = 0; - // 0 1 2 3 4 5 - std::unique_ptr result(WorldDatabase.PQuery("SELECT id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM spell_target_position WHERE (build_min <= %u) && (build_max >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); + // 0 1 2 3 4 5 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation` FROM `spell_target_position` WHERE (`build_min` <= %u) && (`build_max` >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); if (!result) { BarGoLink bar(1); @@ -318,8 +318,8 @@ void SpellMgr::LoadSpellProcEvents() { mSpellProcEventMap.clear(); // need for reload case - // 0 1 2 3 4 5 6 7 8 9 10 - std::unique_ptr result(WorldDatabase.PQuery("SELECT entry, SchoolMask, SpellFamilyName, SpellFamilyMask0, SpellFamilyMask1, SpellFamilyMask2, procFlags, procEx, ppmRate, CustomChance, Cooldown FROM spell_proc_event WHERE (build_min <= %u) && (build_max >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); + // 0 1 2 3 4 5 6 7 8 9 10 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown` FROM `spell_proc_event` WHERE (`build_min` <= %u) && (`build_max` >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); if (!result) { BarGoLink bar(1); @@ -383,8 +383,8 @@ void SpellMgr::LoadSpellProcItemEnchant() uint32 count = 0; - // 0 1 - std::unique_ptr result(WorldDatabase.Query("SELECT entry, ppmRate FROM spell_proc_item_enchant")); + // 0 1 + std::unique_ptr result(WorldDatabase.Query("SELECT `entry`, `ppmRate` FROM `spell_proc_item_enchant`")); if (!result) { @@ -509,8 +509,8 @@ void SpellMgr::LoadSpellGroups() uint32 count = 0; - // 0 1 - std::unique_ptr result(WorldDatabase.PQuery("SELECT group_id, spell_id FROM spell_group WHERE %u BETWEEN build_min AND build_max ORDER BY group_id, group_spell_id, spell_id", SUPPORTED_CLIENT_BUILD)); + // 0 1 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `group_id`, `spell_id` FROM `spell_group` WHERE %u BETWEEN `build_min` AND `build_max` ORDER BY `group_id`, `group_spell_id`, `spell_id`", SUPPORTED_CLIENT_BUILD)); if (!result) { BarGoLink bar(1); @@ -590,8 +590,8 @@ void SpellMgr::LoadSpellGroupStackRules() uint32 count = 0; - // 0 1 - std::unique_ptr result(WorldDatabase.PQuery("SELECT group_id, stack_rule FROM spell_group_stack_rules t1 WHERE build=(SELECT max(build) FROM spell_group_stack_rules t2 WHERE t1.group_id=t2.group_id && build <= %u)", SUPPORTED_CLIENT_BUILD)); + // 0 1 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `group_id`, `stack_rule` FROM `spell_group_stack_rules` t1 WHERE `build`=(SELECT max(`build`) FROM `spell_group_stack_rules` t2 WHERE t1.`group_id`=t2.`group_id` && `build` <= %u)", SUPPORTED_CLIENT_BUILD)); if (!result) { BarGoLink bar(1); @@ -721,8 +721,8 @@ void SpellMgr::LoadSpellElixirs() uint32 count = 0; - // 0 1 - std::unique_ptr result(WorldDatabase.PQuery("SELECT entry, mask FROM spell_elixir WHERE %u BETWEEN build_min AND build_max", SUPPORTED_CLIENT_BUILD)); + // 0 1 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `entry`, `mask` FROM `spell_elixir` WHERE %u BETWEEN `build_min` AND `build_max`", SUPPORTED_CLIENT_BUILD)); if (!result) { @@ -830,8 +830,8 @@ void SpellMgr::LoadSpellThreats() { mSpellThreatMap.clear(); // need for reload case - // 0 1 2 3 - std::unique_ptr result(WorldDatabase.PQuery("SELECT entry, Threat, multiplier, ap_bonus FROM spell_threat WHERE %u BETWEEN build_min AND build_max", SUPPORTED_CLIENT_BUILD)); + // 0 1 2 3 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `entry`, `Threat`, `multiplier`, `ap_bonus` FROM `spell_threat` WHERE %u BETWEEN `build_min` AND `build_max`", SUPPORTED_CLIENT_BUILD)); if (!result) { BarGoLink bar(1); @@ -1579,7 +1579,7 @@ void SpellMgr::LoadSpellChains() } // load custom case - std::unique_ptr result(WorldDatabase.PQuery("SELECT spell_id, prev_spell, first_spell, `rank`, req_spell FROM spell_chain WHERE %u BETWEEN build_min AND build_max", SUPPORTED_CLIENT_BUILD)); + std::unique_ptr result(WorldDatabase.PQuery("SELECT `spell_id`, `prev_spell`, `first_spell`, `rank`, `req_spell` FROM `spell_chain` WHERE %u BETWEEN `build_min` AND `build_max`", SUPPORTED_CLIENT_BUILD)); if (!result) { BarGoLink bar(1); @@ -1849,8 +1849,8 @@ void SpellMgr::LoadSpellEnchantCharges() uint32 count = 0; - // 0 1 - std::unique_ptr result(WorldDatabase.Query("SELECT entry, charges FROM spell_enchant_charges")); + // 0 1 + std::unique_ptr result(WorldDatabase.Query("SELECT `entry`, `charges` FROM `spell_enchant_charges`")); if (!result) { BarGoLink bar(1); @@ -1894,8 +1894,8 @@ void SpellMgr::LoadSpellLearnSpells() { mSpellLearnSpells.clear(); // need for reload case - // 0 1 2 - std::unique_ptr result(WorldDatabase.PQuery("SELECT entry, SpellID, Active FROM spell_learn_spell WHERE (build_min <= %u) && (build_max >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); + // 0 1 2 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `entry`, `SpellID`, `Active` FROM `spell_learn_spell` WHERE (`build_min` <= %u) && (`build_max` >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); if (!result) { BarGoLink bar(1); @@ -2183,8 +2183,8 @@ void SpellMgr::LoadSpellPetAuras() uint32 count = 0; - // 0 1 2 - std::unique_ptr result(WorldDatabase.Query("SELECT spell, pet, aura FROM spell_pet_auras")); + // 0 1 2 + std::unique_ptr result(WorldDatabase.Query("SELECT `spell`, `pet`, `aura` FROM `spell_pet_auras`")); if (!result) { @@ -2337,8 +2337,8 @@ void SpellMgr::LoadSpellAreas() uint32 count = 0; - // 0 1 2 3 4 5 6 7 8 - std::unique_ptr result(WorldDatabase.Query("SELECT spell, area, quest_start, quest_start_active, quest_end, aura_spell, racemask, gender, autocast FROM spell_area")); + // 0 1 2 3 4 5 6 7 8 + std::unique_ptr result(WorldDatabase.Query("SELECT `spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast` FROM `spell_area`")); if (!result) { @@ -2714,8 +2714,8 @@ void SpellMgr::CheckUsedSpells(char const* table) uint32 countSpells = 0; uint32 countMasks = 0; - // 0 1 2 3 4 5 6 7 8 9 10 - std::unique_ptr result(WorldDatabase.PQuery("SELECT spellid,SpellFamilyName,SpellFamilyMask,SpellIcon,SpellVisual,SpellCategory,EffectType,EffectAura,EffectIdx,Name,Code FROM %s", table)); + // 0 1 2 3 4 5 6 7 8 9 10 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `spellid`, `SpellFamilyName`, `SpellFamilyMask`, `SpellIcon`, `SpellVisual`, `SpellCategory`, `EffectType`, `EffectAura`, `EffectIdx`, `Name`, `Code` FROM %s", table)); if (!result) { @@ -3021,8 +3021,8 @@ void SpellMgr::LoadSpellAffects() uint32 count = 0; - // 0 1 2 - std::unique_ptr result(WorldDatabase.PQuery("SELECT entry, effectId, SpellFamilyMask FROM spell_affect WHERE (build_min <= %u) && (build_max >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); + // 0 1 2 + std::unique_ptr result(WorldDatabase.PQuery("SELECT `entry`, `effectId`, `SpellFamilyMask` FROM `spell_affect` WHERE (`build_min` <= %u) && (`build_max` >= %u)", SUPPORTED_CLIENT_BUILD, SUPPORTED_CLIENT_BUILD)); if (!result) { diff --git a/src/game/World.cpp b/src/game/World.cpp index e28079a2f..cc7aaae7c 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -288,7 +288,7 @@ void World::AddSession_(WorldSession* s) static SqlStatementID id; - SqlStatement stmt = LoginDatabase.CreateStatement(id, "UPDATE realmlist SET population = ? WHERE id = ?"); + SqlStatement stmt = LoginDatabase.CreateStatement(id, "UPDATE `realmlist` SET `population` = ? WHERE `id` = ?"); stmt.PExecute(popu, realmID); DETAIL_LOG("Server Population (%f).", popu); @@ -1247,13 +1247,13 @@ void World::SetInitialWorldSettings() // not send custom type REALM_FFA_PVP to realm list uint32 server_type = IsFFAPvPRealm() ? REALM_TYPE_PVP : getConfig(CONFIG_UINT32_GAME_TYPE); uint32 realm_zone = getConfig(CONFIG_UINT32_REALM_ZONE); - LoginDatabase.PExecute("UPDATE realmlist SET icon = %u, timezone = %u WHERE id = '%u'", server_type, realm_zone, realmID); + LoginDatabase.PExecute("UPDATE `realmlist` SET `icon` = %u, `timezone` = %u WHERE `id` = '%u'", server_type, realm_zone, realmID); sLog.outString("Loading GM security access ..."); sAccountMgr.Load(); ///- Remove the bones (they should not exist in DB though) and old corpses after a restart - CharacterDatabase.PExecute("DELETE FROM corpse WHERE corpse_type = '0' OR time < (UNIX_TIMESTAMP()-'%u')", 3 * DAY); + CharacterDatabase.PExecute("DELETE FROM `corpse` WHERE `corpse_type` = '0' OR `time` < (UNIX_TIMESTAMP()-'%u')", 3 * DAY); sLog.outString("Loading spells ..."); sSpellMgr.LoadSpells(); @@ -1665,7 +1665,7 @@ void World::SetInitialWorldSettings() sprintf(isoDate, "%04d-%02d-%02d %02d:%02d:%02d", local.tm_year + 1900, local.tm_mon + 1, local.tm_mday, local.tm_hour, local.tm_min, local.tm_sec); - LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, startstring, uptime) VALUES('%u', " UI64FMTD ", '%s', 0)", + LoginDatabase.PExecute("INSERT INTO `uptime` (`realmid`, `starttime`, `startstring`, `uptime`) VALUES('%u', " UI64FMTD ", '%s', 0)", realmID, uint64(m_startTime), isoDate); @@ -1701,7 +1701,7 @@ void World::SetInitialWorldSettings() sTransportMgr->SpawnContinentTransports(); sLog.outString("Deleting expired bans..."); - LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); + LoginDatabase.Execute("DELETE FROM `ip_banned` WHERE `unbandate`<=UNIX_TIMESTAMP() AND `unbandate`<>`bandate`"); sHonorMaintenancer.Initialize(); sHonorMaintenancer.DoMaintenance(); @@ -1887,7 +1887,7 @@ void World::Update(uint32 diff) uint32 maxClientsNum = GetMaxActiveSessionCount(); m_timers[WUPDATE_UPTIME].Reset(); - LoginDatabase.PExecute("UPDATE uptime SET uptime = %u, onlineplayers = %u, maxplayers = %u WHERE realmid = %u AND starttime = " UI64FMTD, tmpDiff, onlineClientsNum, maxClientsNum, realmID, uint64(m_startTime)); + LoginDatabase.PExecute("UPDATE `uptime` SET `uptime` = %u, `onlineplayers` = %u, `maxplayers` = %u WHERE `realmid` = %u AND `starttime` = " UI64FMTD, tmpDiff, onlineClientsNum, maxClientsNum, realmID, uint64(m_startTime)); } ///- Update objects (maps, transport, creatures,...) @@ -2216,7 +2216,7 @@ void World::WarnAccount(uint32 accountId, std::string from, std::string reason, reason = std::string(type) + ": " + reason; LoginDatabase.escape_string(reason); - LoginDatabase.PExecute("INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active, realm) VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+1, '%s', '%s', '0', %u)", + LoginDatabase.PExecute("INSERT INTO `account_banned` (`id`, `bandate`, `unbandate`, `bannedby`, `banreason`, `active`, `realm`) VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+1, '%s', '%s', '0', %u)", accountId, from.c_str(), reason.c_str(), realmID); } @@ -2227,7 +2227,7 @@ void World::BanAccount(uint32 accountId, uint32 duration, std::string reason, st LoginDatabase.escape_string(safe_author); //No SQL injection as strings are escaped - LoginDatabase.PExecute("INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active, realm) VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+%u, '%s', '%s', '1', %u)", + LoginDatabase.PExecute("INSERT INTO `account_banned` (`id`, `bandate`, `unbandate`, `bannedby`, `banreason`, `active`, `realm`) VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+%u, '%s', '%s', '1', %u)", accountId, duration, safe_author.c_str(), reason.c_str(), realmID); if (duration > 0) @@ -2305,7 +2305,7 @@ public: if (holder->GetBanMode() != BAN_IP) { //No SQL injection as strings are escaped - LoginDatabase.PExecute("INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active, realm) VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+%u, '%s', '%s', '1', %u)", + LoginDatabase.PExecute("INSERT INTO `account_banned` (`id`, `bandate`, `unbandate`, `bannedby`, `banreason`, `active`, `realm`) VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+%u, '%s', '%s', '1', %u)", account, holder->GetDuration(), holder->GetAuthor().c_str(), holder->GetReason().c_str(), holder->GetRealmId()); if (holder->GetDuration() > 0) sAccountMgr.BanAccount(account, time(nullptr) + holder->GetDuration()); @@ -2358,8 +2358,8 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, uint32 duration_ //No SQL injection as strings are escaped db = &LoginDatabase; - holder->SetPQuery(0, "SELECT id FROM account WHERE last_ip = '%s'", nameOrIP.c_str()); - LoginDatabase.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+%u,'%s','%s')", nameOrIP.c_str(), duration_secs, safe_author.c_str(), reason.c_str()); + holder->SetPQuery(0, "SELECT `id` FROM `account` WHERE `last_ip` = '%s'", nameOrIP.c_str()); + LoginDatabase.PExecute("INSERT INTO `ip_banned` VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+%u,'%s','%s')", nameOrIP.c_str(), duration_secs, safe_author.c_str(), reason.c_str()); if (duration_secs > 0) sAccountMgr.BanIP(nameOrIP, time(nullptr) + duration_secs); @@ -2369,13 +2369,13 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, uint32 duration_ case BAN_ACCOUNT: //No SQL injection as string is escaped db = &LoginDatabase; - holder->SetPQuery(0, "SELECT id FROM account WHERE username = '%s'", nameOrIP.c_str()); + holder->SetPQuery(0, "SELECT `id` FROM `account` WHERE `username` = '%s'", nameOrIP.c_str()); break; case BAN_CHARACTER: { db = &CharacterDatabase; if (uint32 guid = sObjectMgr.GetPlayerGuidByName(nameOrIP)) - holder->SetPQuery(0, "SELECT account FROM characters WHERE guid = %u", guid); + holder->SetPQuery(0, "SELECT `account` FROM `characters` WHERE `guid` = %u", guid); break; } default: @@ -2393,7 +2393,7 @@ bool World::RemoveBanAccount(BanMode mode, std::string const& source, std::strin if (mode == BAN_IP) { LoginDatabase.escape_string(nameOrIP); - LoginDatabase.PExecute("DELETE FROM ip_banned WHERE ip = '%s'", nameOrIP.c_str()); + LoginDatabase.PExecute("DELETE FROM `ip_banned` WHERE `ip` = '%s'", nameOrIP.c_str()); sAccountMgr.UnbanIP(nameOrIP); } else @@ -2408,7 +2408,7 @@ bool World::RemoveBanAccount(BanMode mode, std::string const& source, std::strin return false; //NO SQL injection as account is uint32 - LoginDatabase.PExecute("UPDATE account_banned SET active = '0' WHERE id = '%u'", account); + LoginDatabase.PExecute("UPDATE `account_banned` SET `active` = '0' WHERE `id` = '%u'", account); WarnAccount(account, source, message, "UNBAN"); sAccountMgr.UnbanAccount(account); } @@ -2638,7 +2638,7 @@ void World::UpdateResultQueue() void World::UpdateRealmCharCount(uint32 accountId) { CharacterDatabase.AsyncPQuery(this, &World::_UpdateRealmCharCount, accountId, - "SELECT COUNT(guid) FROM characters WHERE account = '%u'", accountId); + "SELECT COUNT(`guid`) FROM `characters` WHERE `account` = '%u'", accountId); } void World::_UpdateRealmCharCount(QueryResult* resultCharCount, uint32 accountId) @@ -2650,8 +2650,8 @@ void World::_UpdateRealmCharCount(QueryResult* resultCharCount, uint32 accountId delete resultCharCount; LoginDatabase.BeginTransaction(); - LoginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid= '%u' AND realmid = '%u'", accountId, realmID); - LoginDatabase.PExecute("INSERT INTO realmcharacters (numchars, acctid, realmid) VALUES (%u, %u, %u)", charCount, accountId, realmID); + LoginDatabase.PExecute("DELETE FROM `realmcharacters` WHERE `acctid`= '%u' AND `realmid` = '%u'", accountId, realmID); + LoginDatabase.PExecute("INSERT INTO `realmcharacters` (`numchars`, `acctid`, `realmid`) VALUES (%u, %u, %u)", charCount, accountId, realmID); LoginDatabase.CommitTransaction(); } } @@ -2667,7 +2667,7 @@ void World::SetPlayerLimit(int32 limit, bool needUpdate) m_playerLimit = limit; if (db_update_need) - LoginDatabase.PExecute("UPDATE realmlist SET allowedSecurityLevel = '%u' WHERE id = '%u'", + LoginDatabase.PExecute("UPDATE `realmlist` SET `allowedSecurityLevel` = '%u' WHERE `id` = '%u'", uint32(GetPlayerSecurityLimit()), realmID); } @@ -2863,7 +2863,7 @@ void World::LogMoneyTrade(ObjectGuid sender, ObjectGuid receiver, uint32 amount, if (!LogsDatabase || !sWorld.getConfig(CONFIG_BOOL_LOGSDB_TRADES)) return; static SqlStatementID insLogMoney; - SqlStatement logStmt = LogsDatabase.CreateStatement(insLogMoney, "INSERT INTO logs_trade SET sender=?, senderType=?, senderEntry=?, receiver=?, amount=?, type=?, data=?"); + SqlStatement logStmt = LogsDatabase.CreateStatement(insLogMoney, "INSERT INTO `logs_trade` SET `sender`=?, `senderType`=?, `senderEntry`=?, `receiver`=?, `amount`=?, `type`=?, `data`=?"); logStmt.addUInt32(sender.GetCounter()); logStmt.addUInt32(sender.GetHigh()); logStmt.addUInt32(sender.GetEntry()); @@ -2880,7 +2880,7 @@ void World::LogCharacter(Player* character, char const* action) return; ASSERT(character); static SqlStatementID insLogChar; - SqlStatement logStmt = LogsDatabase.CreateStatement(insLogChar, "INSERT INTO logs_characters SET type=?, guid=?, account=?, name=?, ip=?, clientHash=?"); + SqlStatement logStmt = LogsDatabase.CreateStatement(insLogChar, "INSERT INTO `logs_characters` SET `type`=?, `guid`=?, `account`=?, `name`=?, `ip`=?, `clientHash`=?"); logStmt.addString(action); logStmt.addUInt32(character->GetGUIDLow()); logStmt.addUInt32(character->GetSession()->GetAccountId()); @@ -2897,7 +2897,7 @@ void World::LogCharacter(WorldSession* sess, uint32 lowGuid, std::string const& return; ASSERT(sess); static SqlStatementID insLogChar; - SqlStatement logStmt = LogsDatabase.CreateStatement(insLogChar, "INSERT INTO logs_characters SET type=?, guid=?, account=?, name=?, ip=?, clientHash=?"); + SqlStatement logStmt = LogsDatabase.CreateStatement(insLogChar, "INSERT INTO `logs_characters` SET `type`=?, `guid`=?, `account`=?, `name`=?, `ip`=?, `clientHash`=?"); logStmt.addString(action); logStmt.addUInt32(lowGuid); logStmt.addUInt32(sess->GetAccountId()); @@ -2927,7 +2927,7 @@ void World::LogChat(WorldSession* sess, char const* type, std::string const& msg return; static SqlStatementID insLogChat; SqlStatement logStmt = LogsDatabase.CreateStatement(insLogChat, - "INSERT INTO logs_chat SET type=?, guid=?, target=?, channelId=?, channelName=?, message=?"); + "INSERT INTO `logs_chat` SET `type`=?, `guid`=?, `target`=?, `channelId`=?, `channelName`=?, `message`=?"); logStmt.addString(type); logStmt.addUInt32(plr->GetObjectGuid().GetCounter()); logStmt.addUInt32(target ? target->GetObjectGuid().GetCounter() : 0); @@ -2944,8 +2944,8 @@ void World::LogTransaction(PlayerTransactionData const& data) static SqlStatementID insLogTransaction; SqlStatement logStmt = LogsDatabase.CreateStatement(insLogTransaction, - "INSERT INTO logs_transactions SET type=?, guid1=?, money1=?, spell1=?, items1=?, " - "guid2=?, money2=?, spell2=?, items2=?"); + "INSERT INTO `logs_transactions` SET `type`=?, `guid1`=?, `money1`=?, `spell1`=?, `items1`=?, " + "`guid2`=?, `money2`=?, `spell2`=?, `items2`=?"); logStmt.addString(data.type); for (const auto& part : data.parts) { diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index d9fb588e8..e848ef5a6 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -669,7 +669,7 @@ void WorldSession::LogoutPlayer(bool Save) // No SQL injection as AccountID is uint32 static SqlStatementID id; - SqlStatement stmt = LoginDatabase.CreateStatement(id, "UPDATE account SET current_realm = ?, online = 0 WHERE id = ?"); + SqlStatement stmt = LoginDatabase.CreateStatement(id, "UPDATE `account` SET `current_realm` = ?, `online` = 0 WHERE `id` = ?"); stmt.PExecute(uint32(0), GetAccountId()); ///- If the player is in a guild, update the guild roster and broadcast a logout message to other guild members @@ -1099,7 +1099,7 @@ void WorldSession::ProcessAnticheatAction(char const* detector, char const* reas action = "Muted from public channels."; if (GetSecurity() == SEC_PLAYER) { - LoginDatabase.PExecute("UPDATE account SET flags = flags | 0x%x WHERE id = %u", ACCOUNT_FLAG_MUTED_FROM_PUBLIC_CHANNELS, GetAccountId()); + LoginDatabase.PExecute("UPDATE `account` SET `flags` = `flags` | 0x%x WHERE `id` = %u", ACCOUNT_FLAG_MUTED_FROM_PUBLIC_CHANNELS, GetAccountId()); SetAccountFlags(GetAccountFlags() | ACCOUNT_FLAG_MUTED_FROM_PUBLIC_CHANNELS); } } diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp index d573dc5c4..392cf5578 100644 --- a/src/mangosd/Master.cpp +++ b/src/mangosd/Master.cpp @@ -304,7 +304,7 @@ int Master::Run() std::string builds = AcceptableClientBuildsListStr(); LoginDatabase.escape_string(builds); - LoginDatabase.PExecute("UPDATE realmlist SET realmflags = realmflags & ~(%u), population = 0, realmbuilds = '%s' WHERE id = '%u'", REALM_FLAG_OFFLINE, builds.c_str(), realmID); + LoginDatabase.PExecute("UPDATE `realmlist` SET `realmflags` = `realmflags` & ~(%u), `population` = 0, `realmbuilds` = '%s' WHERE `id` = '%u'", REALM_FLAG_OFFLINE, builds.c_str(), realmID); } ACE_Based::Thread* cliThread = nullptr; @@ -614,12 +614,12 @@ void Master::clearOnlineAccounts() { // Cleanup online status for characters hosted at current realm /// \todo Only accounts with characters logged on *this* realm should have online status reset. Move the online column from 'account' to 'realmcharacters'? - LoginDatabase.PExecute("UPDATE account SET current_realm = 0 WHERE current_realm = '%u'", realmID); + LoginDatabase.PExecute("UPDATE `account` SET `current_realm` = 0 WHERE `current_realm` = '%u'", realmID); - CharacterDatabase.Execute("UPDATE characters SET online = 0 WHERE online<>0"); + CharacterDatabase.Execute("UPDATE `characters` SET `online` = 0 WHERE `online`<>0"); // Battleground instance ids reset at server restart - CharacterDatabase.Execute("UPDATE character_battleground_data SET instance_id = 0"); + CharacterDatabase.Execute("UPDATE `character_battleground_data` SET `instance_id` = 0"); } #include "ObjectAccessor.h" diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp index fbab8ec75..5bfc8791e 100644 --- a/src/realmd/AuthSocket.cpp +++ b/src/realmd/AuthSocket.cpp @@ -297,7 +297,7 @@ void AuthSocket::_SetVSFields(const std::string& rI) const char *v_hex, *s_hex; v_hex = v.AsHexStr(); s_hex = s.AsHexStr(); - LoginDatabase.PExecute("UPDATE account SET v = '%s', s = '%s' WHERE username = '%s'", v_hex, s_hex, _safelogin.c_str() ); + LoginDatabase.PExecute("UPDATE `account` SET `v` = '%s', `s` = '%s' WHERE `username` = '%s'", v_hex, s_hex, _safelogin.c_str() ); OPENSSL_free((void*)v_hex); OPENSSL_free((void*)s_hex); } @@ -412,9 +412,9 @@ bool AuthSocket::_HandleLogonChallenge() // No SQL injection possible (paste the IP address as passed by the socket) std::string address = get_remote_address(); LoginDatabase.escape_string(address); - QueryResult *result = LoginDatabase.PQuery("SELECT unbandate FROM ip_banned WHERE " + QueryResult *result = LoginDatabase.PQuery("SELECT `unbandate` FROM `ip_banned` WHERE " // permanent still banned - "(unbandate = bandate OR unbandate > UNIX_TIMESTAMP()) AND ip = '%s'", address.c_str()); + "(`unbandate` = `bandate` OR `unbandate` > UNIX_TIMESTAMP()) AND `ip` = '%s'", address.c_str()); if (result) { pkt << (uint8)WOW_FAIL_DB_BUSY; @@ -425,7 +425,7 @@ bool AuthSocket::_HandleLogonChallenge() { ///- Get the account details from the account table // No SQL injection (escaped user name) - result = LoginDatabase.PQuery("SELECT sha_pass_hash,id,locked,last_ip,v,s,security,email_verif,geolock_pin,email,UNIX_TIMESTAMP(joindate) FROM account WHERE username = '%s'",_safelogin.c_str ()); + result = LoginDatabase.PQuery("SELECT `sha_pass_hash`, `id`, `locked`, `last_ip`, `v`, `s`, `security`, `email_verif`, `geolock_pin`, `email`, UNIX_TIMESTAMP(`joindate`) FROM `account` WHERE `username` = '%s'",_safelogin.c_str ()); if (result) { Field* fields = result->Fetch(); @@ -487,8 +487,8 @@ bool AuthSocket::_HandleLogonChallenge() { uint32 account_id = fields[1].GetUInt32(); ///- If the account is banned, reject the logon attempt - QueryResult *banresult = LoginDatabase.PQuery("SELECT bandate,unbandate FROM account_banned WHERE " - "id = %u AND active = 1 AND (unbandate > UNIX_TIMESTAMP() OR unbandate = bandate) LIMIT 1", account_id); + QueryResult *banresult = LoginDatabase.PQuery("SELECT `bandate`, `unbandate` FROM `account_banned` WHERE " + "`id` = %u AND `active` = 1 AND (`unbandate` > UNIX_TIMESTAMP() OR `unbandate` = `bandate`) LIMIT 1", account_id); if (banresult) { if((*banresult)[0].GetUInt64() == (*banresult)[1].GetUInt64()) @@ -814,7 +814,7 @@ bool AuthSocket::_HandleLogonProof() // Geolocking checks must be done after an otherwise successful login to prevent lockout attacks if (_geoUnlockPIN) // remove the PIN to unlock the account since login succeeded { - auto result = LoginDatabase.PExecute("UPDATE account SET geolock_pin = 0 WHERE username = '%s'", + auto result = LoginDatabase.PExecute("UPDATE `account` SET `geolock_pin` = 0 WHERE `username` = '%s'", _safelogin.c_str()); if (!result) @@ -827,7 +827,7 @@ bool AuthSocket::_HandleLogonProof() BASIC_LOG("Account '%s' (%u) using IP '%s' has been geolocked", _login.c_str(), _accountId, get_remote_address().c_str()); // todo, add additional logging info auto pin = urand(100000, 999999); // check rand32_max - auto result = LoginDatabase.PExecute("UPDATE account SET geolock_pin = %u WHERE username = '%s'", + auto result = LoginDatabase.PExecute("UPDATE `account` SET `geolock_pin` = %u WHERE `username` = '%s'", pin, _safelogin.c_str()); if (!result) @@ -874,7 +874,7 @@ bool AuthSocket::_HandleLogonProof() // No SQL injection (escaped user name) and IP address as received by socket const char* K_hex = K.AsHexStr(); const char *os = reinterpret_cast(&_os); // no injection as there are only two possible values - auto result = LoginDatabase.PQuery("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = '%u', failed_logins = 0, os = '%s' WHERE username = '%s'", + auto result = LoginDatabase.PQuery("UPDATE `account` SET `sessionkey` = '%s', `last_ip` = '%s', `last_login` = NOW(), `locale` = '%u', `failed_logins` = 0, `os` = '%s' WHERE `username` = '%s'", K_hex, get_remote_address().c_str(), GetLocaleByName(_localizationName), os, _safelogin.c_str() ); delete result; OPENSSL_free((void*)K_hex); @@ -908,9 +908,9 @@ bool AuthSocket::_HandleLogonProof() if(MaxWrongPassCount > 0) { //Increment number of failed logins by one and if it reaches the limit temporarily ban that account or IP - LoginDatabase.PExecute("UPDATE account SET failed_logins = failed_logins + 1 WHERE username = '%s'",_safelogin.c_str()); + LoginDatabase.PExecute("UPDATE `account` SET `failed_logins` = `failed_logins` + 1 WHERE `username` = '%s'",_safelogin.c_str()); - if(QueryResult *loginfail = LoginDatabase.PQuery("SELECT id, failed_logins FROM account WHERE username = '%s'", _safelogin.c_str())) + if(QueryResult *loginfail = LoginDatabase.PQuery("SELECT `id`, `failed_logins` FROM `account` WHERE `username` = '%s'", _safelogin.c_str())) { Field* fields = loginfail->Fetch(); uint32 failed_logins = fields[1].GetUInt32(); @@ -923,7 +923,7 @@ bool AuthSocket::_HandleLogonProof() if(WrongPassBanType) { uint32 acc_id = fields[0].GetUInt32(); - LoginDatabase.PExecute("INSERT INTO account_banned (id, bandate, unbandate, bannedby, banreason, active, realm) " + LoginDatabase.PExecute("INSERT INTO `account_banned` (`id`, `bandate`, `unbandate`, `bannedby`, `banreason`, `active`, `realm`) " "VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','MaNGOS realmd','Failed login autoban',1,1)", acc_id, WrongPassBanTime); BASIC_LOG("[AuthChallenge] Account '%s' using IP '%s' got banned for '%u' seconds because it failed to authenticate '%u' times", @@ -933,7 +933,7 @@ bool AuthSocket::_HandleLogonProof() { std::string current_ip = get_remote_address(); LoginDatabase.escape_string(current_ip); - LoginDatabase.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','MaNGOS realmd','Failed login autoban')", + LoginDatabase.PExecute("INSERT INTO `ip_banned` VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','MaNGOS realmd','Failed login autoban')", current_ip.c_str(), WrongPassBanTime); BASIC_LOG("[AuthChallenge] IP '%s' got banned for '%u' seconds because account '%s' failed to authenticate '%u' times", current_ip.c_str(), WrongPassBanTime, _login.c_str(), failed_logins); @@ -987,7 +987,7 @@ bool AuthSocket::_HandleReconnectChallenge() EndianConvert(ch->build); _build = ch->build; - QueryResult *result = LoginDatabase.PQuery ("SELECT sessionkey,id FROM account WHERE username = '%s'", _safelogin.c_str ()); + QueryResult *result = LoginDatabase.PQuery ("SELECT `sessionkey`, `id` FROM `account` WHERE `username` = '%s'", _safelogin.c_str ()); // Stop if the account is not found if (!result) @@ -1135,7 +1135,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt) uint8 AmountOfCharacters; // No SQL injection. id of realm is controlled by the database. - QueryResult *result = LoginDatabase.PQuery( "SELECT numchars FROM realmcharacters WHERE realmid = '%d' AND acctid='%u'", i->second.m_ID, _accountId); + QueryResult *result = LoginDatabase.PQuery( "SELECT `numchars` FROM `realmcharacters` WHERE `realmid` = '%d' AND `acctid`='%u'", i->second.m_ID, _accountId); if( result ) { Field *fields = result->Fetch(); @@ -1196,7 +1196,7 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt) uint8 AmountOfCharacters; // No SQL injection. id of realm is controlled by the database. - QueryResult *result = LoginDatabase.PQuery( "SELECT numchars FROM realmcharacters WHERE realmid = '%d' AND acctid='%u'", i->second.m_ID, _accountId); + QueryResult *result = LoginDatabase.PQuery( "SELECT `numchars` FROM `realmcharacters` WHERE `realmid` = '%d' AND `acctid`='%u'", i->second.m_ID, _accountId); if( result ) { Field *fields = result->Fetch(); @@ -1428,7 +1428,7 @@ void AuthSocket::InitPatch() void AuthSocket::LoadAccountSecurityLevels(uint32 accountId) { - QueryResult* result = LoginDatabase.PQuery("SELECT gmlevel, RealmID FROM account_access WHERE id = %u", + QueryResult* result = LoginDatabase.PQuery("SELECT `gmlevel`, `RealmID` FROM `account_access` WHERE `id` = %u", accountId); if (!result) return; diff --git a/src/realmd/Main.cpp b/src/realmd/Main.cpp index df9e89d3b..921b855b6 100644 --- a/src/realmd/Main.cpp +++ b/src/realmd/Main.cpp @@ -258,7 +258,7 @@ extern int main(int argc, char **argv) // Ensure the table used for geolocking has some data in it, if enabled if (sConfig.GetBoolDefault("GeoLocking", false)) { - auto result = std::unique_ptr(LoginDatabase.Query("SELECT 1 FROM geoip LIMIT 1")); + auto result = std::unique_ptr(LoginDatabase.Query("SELECT 1 FROM `geoip` LIMIT 1")); if (!result) { @@ -279,8 +279,8 @@ extern int main(int argc, char **argv) // cleanup query // set expired bans to inactive LoginDatabase.BeginTransaction(); - LoginDatabase.Execute("UPDATE account_banned SET active = 0 WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); - LoginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate"); + LoginDatabase.Execute("UPDATE `account_banned` SET `active` = 0 WHERE `unbandate`<=UNIX_TIMESTAMP() AND `unbandate`<>`bandate`"); + LoginDatabase.Execute("DELETE FROM `ip_banned` WHERE `unbandate`<=UNIX_TIMESTAMP() AND `unbandate`<>`bandate`"); LoginDatabase.CommitTransaction(); ///- Launch the listening network socket diff --git a/src/realmd/RealmList.cpp b/src/realmd/RealmList.cpp index be18e4b83..d26fae35e 100644 --- a/src/realmd/RealmList.cpp +++ b/src/realmd/RealmList.cpp @@ -156,11 +156,11 @@ void RealmList::UpdateRealms(bool init) DETAIL_LOG("Updating Realm List..."); QueryResult *result = LoginDatabase.Query( - // 0 1 2 3 4 5 6 - "SELECT id, name, address, port, icon, realmflags, timezone, " - // 7 8 9 - "allowedSecurityLevel, population, realmbuilds FROM realmlist " - "WHERE (realmflags & 1) = 0 ORDER BY name"); + // 0 1 2 3 4 5 6 + "SELECT `id`, `name`, `address`, `port`, `icon`, `realmflags`, `timezone`, " + // 7 8 9 + "`allowedSecurityLevel`, `population`, `realmbuilds` FROM `realmlist` " + "WHERE (`realmflags` & 1) = 0 ORDER BY `name`"); ///- Circle through results and add them to the realm map if(result)