diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index 2996e5b95..cc68350ea 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -514,7 +514,7 @@ void AchievementMgr::SaveToDB() iter->second.changed = false; // new/changed record data - SqlStatement stmt = CharacterDatabase.CreateStatement(delProgress, "DELETE FROM character_achievement_progress WHERE guid = ? AND criteria = ?"); + SqlStatement stmt = CharacterDatabase.CreateStatement(delProgress, "DELETE FROM character_achievement_progress WHERE guid = ? AND criteria = ?"); stmt.PExecute(GetPlayer()->GetGUIDLow(), iter->first); bool needSave = iter->second.counter != 0; diff --git a/src/game/Item.cpp b/src/game/Item.cpp index 1b0906734..5eb22a275 100644 --- a/src/game/Item.cpp +++ b/src/game/Item.cpp @@ -305,7 +305,7 @@ void Item::SaveToDB() for(uint16 i = 0; i < m_valuesCount; ++i ) ss << GetUInt32Value(i) << " "; - stmt = CharacterDatabase.CreateStatement(insItem, "INSERT INTO item_instance (guid,owner_guid,data,text) VALUES (?, ?, ?, ?)"); + stmt = CharacterDatabase.CreateStatement(insItem, "INSERT INTO item_instance (guid,owner_guid,data,text) VALUES (?, ?, ?, ?)"); stmt.PExecute(guid, GetOwnerGuid().GetCounter(), ss.str().c_str(), m_text.c_str()); } break; case ITEM_CHANGED: diff --git a/src/game/MapPersistentStateMgr.cpp b/src/game/MapPersistentStateMgr.cpp index 814e0f4be..0b1020a20 100644 --- a/src/game/MapPersistentStateMgr.cpp +++ b/src/game/MapPersistentStateMgr.cpp @@ -105,7 +105,7 @@ void MapPersistentState::SaveGORespawnTime(uint32 loguid, time_t t) static SqlStatementID delSpawnTime ; static SqlStatementID insSpawnTime ; - + SqlStatement stmt = CharacterDatabase.CreateStatement(delSpawnTime, "DELETE FROM gameobject_respawn WHERE guid = ? AND instance = ?"); stmt.PExecute(loguid, m_instanceid); diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 897720912..276d02932 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -388,7 +388,7 @@ void Pet::SavePetToDB(PetSaveMode mode) if (mode <= PET_SAVE_LAST_STABLE_SLOT) { static SqlStatementID updPet ; - + stmt = CharacterDatabase.CreateStatement(updPet, "UPDATE character_pet SET slot = ? WHERE owner = ? AND slot = ?"); stmt.PExecute(uint32(PET_SAVE_NOT_IN_SLOT), ownerLow, uint32(mode)); } @@ -397,7 +397,7 @@ void Pet::SavePetToDB(PetSaveMode mode) if (getPetType()==HUNTER_PET && (mode==PET_SAVE_AS_CURRENT||mode > PET_SAVE_LAST_STABLE_SLOT)) { static SqlStatementID del ; - + stmt = CharacterDatabase.CreateStatement(del, "DELETE FROM character_pet WHERE owner = ? AND (slot = ? OR slot > ?)"); stmt.PExecute(ownerLow, uint32(PET_SAVE_AS_CURRENT), uint32(PET_SAVE_LAST_STABLE_SLOT)); } @@ -406,7 +406,7 @@ void Pet::SavePetToDB(PetSaveMode mode) SqlStatement savePet = CharacterDatabase.CreateStatement(insPet, "INSERT INTO character_pet ( id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, " "curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); - + savePet.addUInt32(m_charmInfo->GetPetNumber()); savePet.addUInt32(GetEntry()); savePet.addUInt32(ownerLow); @@ -1391,7 +1391,7 @@ void Pet::_SaveAuras() if (!effIndexMask) continue; - + stmt = CharacterDatabase.CreateStatement(insAuras, "INSERT INTO pet_aura (guid, caster_guid, item_guid, spell, stackcount, remaincharges, basepoints0, basepoints1, basepoints2, maxduration0, maxduration1, maxduration2, remaintime0, remaintime1, remaintime2, effIndexMask) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index d594e3336..e7c5f5648 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -3714,7 +3714,7 @@ void Player::_SaveSpellCooldowns() { static SqlStatementID deleteSpellCooldown ; static SqlStatementID insertSpellCooldown ; - + SqlStatement stmt = CharacterDatabase.CreateStatement(deleteSpellCooldown, "DELETE FROM character_spell_cooldown WHERE guid = ?"); stmt.PExecute(GetGUIDLow()); @@ -11462,7 +11462,7 @@ void Player::DestroyItem( uint8 bag, uint8 slot, bool update ) if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_DYNFLAG_WRAPPED)) { static SqlStatementID delGifts ; - + SqlStatement stmt = CharacterDatabase.CreateStatement(delGifts, "DELETE FROM character_gifts WHERE item_guid = ?"); stmt.PExecute(pItem->GetGUIDLow()); } @@ -17086,7 +17086,7 @@ void Player::SaveToDB() static SqlStatementID delChar ; static SqlStatementID insChar ; - + SqlStatement stmt = CharacterDatabase.CreateStatement(delChar, "DELETE FROM characters WHERE guid = ?"); stmt.PExecute(GetGUIDLow()); @@ -17278,7 +17278,7 @@ void Player::SaveInventoryAndGoldToDB() void Player::SaveGoldToDB() { static SqlStatementID updateGold ; - + SqlStatement stmt = CharacterDatabase.CreateStatement(updateGold, "UPDATE characters SET money = ? WHERE guid = ?"); stmt.PExecute(GetMoney(), GetGUIDLow()); } @@ -17656,7 +17656,7 @@ void Player::_SaveQuestStatus() { SqlStatement stmt = CharacterDatabase.CreateStatement(updateQuestStatus, "UPDATE character_queststatus SET status = ?,rewarded = ?,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); stmt.addUInt8(i->second.m_explored); @@ -17872,7 +17872,7 @@ void Player::_SaveStats() 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, maxpower6, maxpower7, " "strength, agility, stamina, intellect, spirit, armor, resHoly, resFire, resNature, resFrost, resShadow, resArcane, " "blockPct, dodgePct, parryPct, critPct, rangedCritPct, spellCritPct, attackPower, rangedAttackPower, spellPower) " diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index a6d27e523..0762bb28d 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -171,7 +171,7 @@ void Database::StopServer() } SqlDelayThread * Database::CreateDelayThread() -{ +{ assert(m_pAsyncConn); return new SqlDelayThread(this, m_pAsyncConn); } @@ -608,7 +608,7 @@ SqlStatement Database::CreateStatement(SqlStatementID& index, const char * fmt ) std::string Database::GetStmtString(const int stmtId) const { LOCK_GUARD _guard(m_stmtGuard); - + if(stmtId == -1 || stmtId > m_iStmtIndex) return std::string(); diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index 2ff0740f4..9516f6c73 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -222,7 +222,7 @@ class MANGOS_DLL_SPEC Database void AllowAsyncTransactions() { m_bAllowAsyncTransactions = true; } protected: - Database() : m_pAsyncConn(NULL), m_pResultQueue(NULL), m_threadBody(NULL), m_delayThread(NULL), + Database() : m_pAsyncConn(NULL), m_pResultQueue(NULL), m_threadBody(NULL), m_delayThread(NULL), m_logSQL(false), m_pingIntervallms(0), m_nQueryConnPoolSize(1), m_bAllowAsyncTransactions(false), m_iStmtIndex(-1) { m_nQueryCounter = -1; @@ -243,7 +243,7 @@ class MANGOS_DLL_SPEC Database //initializes new SqlTransaction object SqlTransaction * init(); - //gets pointer on current transaction object. Returns NULL if transaction was not initiated + //gets pointer on current transaction object. Returns NULL if transaction was not initiated SqlTransaction * get() const { return m_pTrans; } //detaches SqlTransaction object allocated by init() function //next call to get() function will return NULL! @@ -297,7 +297,7 @@ class MANGOS_DLL_SPEC Database mutable LOCK_TYPE m_stmtGuard; typedef UNORDERED_MAP PreparedStmtRegistry; - PreparedStmtRegistry m_stmtRegistry; ///< + PreparedStmtRegistry m_stmtRegistry; ///< int m_iStmtIndex; diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp index 6b9fc3173..dd635e93d 100644 --- a/src/shared/Database/DatabaseMysql.cpp +++ b/src/shared/Database/DatabaseMysql.cpp @@ -64,7 +64,7 @@ DatabaseMysql::~DatabaseMysql() } SqlConnection * DatabaseMysql::CreateConnection() -{ +{ return new MySQLConnection(*this); } @@ -318,7 +318,7 @@ SqlPreparedStatement * MySQLConnection::CreateStatement( const std::string& fmt ////////////////////////////////////////////////////////////////////////// -MySqlPreparedStatement::MySqlPreparedStatement( const std::string& fmt, SqlConnection& conn, MYSQL * mysql ) : SqlPreparedStatement(fmt, conn), +MySqlPreparedStatement::MySqlPreparedStatement( const std::string& fmt, SqlConnection& conn, MYSQL * mysql ) : SqlPreparedStatement(fmt, conn), m_pMySQLConn(mysql), m_stmt(NULL), m_pInputArgs(NULL), m_pResult(NULL), m_pResultMetadata(NULL) { } diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h index baff78b81..4cddb2134 100644 --- a/src/shared/Database/SqlOperations.h +++ b/src/shared/Database/SqlOperations.h @@ -72,7 +72,7 @@ class SqlPreparedRequest : public SqlOperation public: SqlPreparedRequest(int nIndex, SqlStmtParameters * arg); ~SqlPreparedRequest(); - + bool Execute(SqlConnection *conn); private: diff --git a/src/shared/Database/SqlPreparedStatement.cpp b/src/shared/Database/SqlPreparedStatement.cpp index 3d70a0c80..bc726c7fc 100644 --- a/src/shared/Database/SqlPreparedStatement.cpp +++ b/src/shared/Database/SqlPreparedStatement.cpp @@ -135,7 +135,7 @@ bool SqlPlainPreparedStatement::execute() } void SqlPlainPreparedStatement::DataToString( const SqlStmtFieldData& data, std::ostringstream& fmt ) -{ +{ switch (data.type()) { case FIELD_BOOL: fmt << "'" << uint32(data.toBool()) << "'"; break; @@ -153,8 +153,8 @@ void SqlPlainPreparedStatement::DataToString( const SqlStmtFieldData& data, std: { std::string tmp = data.toStr(); m_pConn.DB().escape_string(tmp); - fmt << "'" << tmp << "'"; + fmt << "'" << tmp << "'"; } break; } -} \ No newline at end of file +} diff --git a/src/shared/Database/SqlPreparedStatement.h b/src/shared/Database/SqlPreparedStatement.h index c6ba6c4ac..7f6b974c2 100644 --- a/src/shared/Database/SqlPreparedStatement.h +++ b/src/shared/Database/SqlPreparedStatement.h @@ -151,7 +151,7 @@ class MANGOS_DLL_SPEC SqlStmtParameters //get amount of bound parameters int boundParams() const { return int(m_params.size()); } - //add parameter + //add parameter void addParam(const SqlStmtFieldData& data) { m_params.push_back(data); } //empty SQL statement parameters. In case nParams > 1 - reserve memory for parameters //should help to reuse the same object with batched SQL requests @@ -348,5 +348,3 @@ class MANGOS_DLL_SPEC SqlPlainPreparedStatement : public SqlPreparedStatement }; #endif - - diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a53f70e2c..04be32ded 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11291" + #define REVISION_NR "11292" #endif // __REVISION_NR_H__