diff options
| author | Azazel <azazel.kon@gmail.com> | 2011-02-24 05:13:28 +0600 |
|---|---|---|
| committer | Azazel <azazel.kon@gmail.com> | 2011-02-25 00:46:26 +0600 |
| commit | 0c8f1c7b5bb7ec936ab243c49b00d8ede60785a0 (patch) | |
| tree | 67e3e320d04f964c4afa9f8aaa8fa3df33260f34 /src/server/shared/Database | |
| parent | bcd7e45e1227741a38001423d9a713e6614edd3f (diff) | |
Core/Misc: rename some prepared statements to conform to naming standards (there are no CLEAN statements, there are DEL ones)
Diffstat (limited to 'src/server/shared/Database')
| -rwxr-xr-x | src/server/shared/Database/Implementation/CharacterDatabase.cpp | 11 | ||||
| -rwxr-xr-x | src/server/shared/Database/Implementation/CharacterDatabase.h | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index dd8241321cc..0202e4ba91f 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -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) diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h index 72d4f1a84f4..fbe2498b511 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.h +++ b/src/server/shared/Database/Implementation/CharacterDatabase.h @@ -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, |