josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: rename some prepared statements to conform to naming standards (there are no CLEAN statements, there are DEL ones)

Browse Source
This commit is contained in:
Azazel
2011-02-25 00:46:26 +06:00
parent bcd7e45e12
commit 0c8f1c7b5b
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+5 -5
View File
@@ -3643,7 +3643,7 @@ void ObjectMgr::LoadGuilds()
uint32 oldMSTime = getMSTime();
// Delete orphaned guild rank entries before loading the valid ones
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_CLEAN_GUILD_RANKS);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_NONEXISTENT_GUILD_RANKS);
CharacterDatabase.Execute(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_LOAD_GUILD_RANKS);
@@ -3680,7 +3680,7 @@ void ObjectMgr::LoadGuilds()
uint32 oldMSTime = getMSTime();
// Delete orphaned guild member entries before loading the valid ones
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_CLEAN_GUILD_MEMBERS);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_NONEXISTENT_GUILD_MEMBERS);
CharacterDatabase.Execute(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_LOAD_GUILD_MEMBERS);
@@ -3717,7 +3717,7 @@ void ObjectMgr::LoadGuilds()
uint32 oldMSTime = getMSTime();
// Delete orphaned guild bank right entries before loading the valid ones
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_CLEAN_GUILD_BANK_RIGHTS);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_NONEXISTENT_GUILD_BANK_RIGHTS);
CharacterDatabase.Execute(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_LOAD_GUILD_BANK_RIGHTS);
@@ -3829,7 +3829,7 @@ void ObjectMgr::LoadGuilds()
uint32 oldMSTime = getMSTime();
// Delete orphaned guild bank tab entries before loading the valid ones
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_CLEAN_GUILD_BANK_TABS);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_NONEXISTENT_GUILD_BANK_TABS);
CharacterDatabase.Execute(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_LOAD_GUILD_BANK_TABS);
@@ -3866,7 +3866,7 @@ void ObjectMgr::LoadGuilds()
uint32 oldMSTime = getMSTime();
// Delete orphan guild bank items
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_CLEAN_GUILD_BANK_ITEMS);
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_NONEXISTENT_GUILD_BANK_ITEMS);
CharacterDatabase.Execute(stmt);
stmt = CharacterDatabase.GetPreparedStatement(CHAR_LOAD_GUILD_BANK_ITEMS);
src/server/shared/Database/Implementation/CharacterDatabase.cpp
+6 -5
View File
@@ -229,11 +229,12 @@ bool CharacterDatabaseConnection::Open()
// 11 12 13 14 15
"guildid, TabId, SlotId, item_guid, itemEntry FROM guild_bank_item gbi INNER JOIN item_instance ii ON gbi.item_guid = ii.guid", CONNECTION_SYNCH)
PREPARE_STATEMENT(CHAR_CLEAN_GUILD_RANKS, "DELETE FROM guild_rank WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_CLEAN_GUILD_MEMBERS, "DELETE FROM guild_member WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_CLEAN_GUILD_BANK_TABS, "DELETE FROM guild_bank_tab WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_CLEAN_GUILD_BANK_RIGHTS, "DELETE FROM guild_bank_right WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_CLEAN_GUILD_BANK_ITEMS, "DELETE FROM guild_bank_item WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_DEL_NONEXISTENT_GUILD_RANKS, "DELETE FROM guild_rank WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_DEL_NONEXISTENT_GUILD_MEMBERS, "DELETE FROM guild_member WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_DEL_NONEXISTENT_GUILD_BANK_TABS, "DELETE FROM guild_bank_tab WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_DEL_NONEXISTENT_GUILD_BANK_RIGHTS, "DELETE FROM guild_bank_right WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_DEL_NONEXISTENT_GUILD_BANK_ITEMS, "DELETE FROM guild_bank_item WHERE guildId NOT IN (SELECT guildid FROM guild)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_DEL_CREATURE_RESPAWN_TIME, "DELETE FROM creature_respawn WHERE guid = ? AND instance = ?", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_ADD_CREATURE_RESPAWN_TIME, "REPLACE INTO creature_respawn VALUES (?, ?, ?)", CONNECTION_ASYNC)
PREPARE_STATEMENT(CHAR_DEL_EXPIRED_GO_RESPAWN_TIMES, "DELETE FROM gameobject_respawn WHERE respawntime <= UNIX_TIMESTAMP()", CONNECTION_SYNCH)
src/server/shared/Database/Implementation/CharacterDatabase.h
+5 -5
View File
@@ -191,11 +191,11 @@ enum CharacterDatabaseStatements
CHAR_LOAD_GUILD_BANK_TABS,
CHAR_LOAD_GUILD_EVENTLOGS,
CHAR_LOAD_GUILD_BANK_EVENTLOGS,
CHAR_CLEAN_GUILD_RANKS,
CHAR_CLEAN_GUILD_MEMBERS,
CHAR_CLEAN_GUILD_BANK_TABS,
CHAR_CLEAN_GUILD_BANK_RIGHTS,
CHAR_CLEAN_GUILD_BANK_ITEMS,
CHAR_DEL_NONEXISTENT_GUILD_RANKS,
CHAR_DEL_NONEXISTENT_GUILD_MEMBERS,
CHAR_DEL_NONEXISTENT_GUILD_BANK_TABS,
CHAR_DEL_NONEXISTENT_GUILD_BANK_RIGHTS,
CHAR_DEL_NONEXISTENT_GUILD_BANK_ITEMS,
CHAR_DEL_CREATURE_RESPAWN_TIME,
CHAR_ADD_CREATURE_RESPAWN_TIME,